Merge branch 'master' into develop

package.json

@@ -20,82 +20,125 @@
  "Aamir Poonawalla <[email protected]>",
  "Admas <[email protected]>",
  "algenon <[email protected]>",
- "Alvin Portillo <[email protected]>",
+ "Alvin Portillo <[email protected]>",
+ "Amumu <[email protected]>",
  "Andrea Vaghi <[email protected]>",
  "Anton Zhiyanov <[email protected]>",
  "Arturo Mejia <[email protected]>",
  "Arun Rama Reddy <[email protected]>",
  "Austin Pray <[email protected]>",
+ "Bendeguz <[email protected]>",
  "Benjamin Bertrand <[email protected]>",
  "Benjamin Urban <[email protected]>",
  "boneyao <[email protected]>",
  "Carl C Von Lewin <[email protected]>",
  "CESAR RAMOS <[email protected]>",
+ "Chad Killingsworth <[email protected]>",
  "Christopher De Cairos <[email protected]>",
+ "Cyrille David <[email protected]>",
  "Dario Vladovic <[email protected]>",
+ "David Annez <[email protected]>",
  "Davit Barbakadze <[email protected]>",
  "ddivernois <[email protected]>",
+ "Deliaz <[email protected]>",
  "Demis Palma <[email protected]>",
  "dhoko <[email protected]>",
  "dianhe <[email protected]>",
+ "dineshks1 <[email protected]@outlook.com>",
  "Dmitry Tyschenko <[email protected]>",
  "Douglas Li <[email protected]>",
  "Dumitru Uzun <[email protected]>",
+ "Dustin <[email protected]>",
+ "Elchin Valiyev <[email protected]>",
+ "Emil Hesslow <[email protected]>",
+ "Eric Redon <[email protected]>",
  "Eric Schrenker <[email protected]>",
  "Erik Hesselink <[email protected]>",
  "Fabian Becker <[email protected]>",
- "Faisal Salman <fyzlman@gmail.com>",
+ "Faisal Salman <f@faisalman.com>",
  "Frédéric Camblor <[email protected]>",
+ "Frederik Ring <[email protected]>",
+ "Gerald Host <[email protected]>",
  "Germán M. Bravo <[email protected]>",
  "Grigory Dmitrenko <[email protected]>",
+ "gulpin <[email protected]>",
  "Hendrik Helwich <[email protected]>",
  "Hermann Ebert <[email protected]>",
+ "hr6r <[email protected]>",
+ "Igor Topal <[email protected]>",
+ "Ildar Kamalov <[email protected]>",
+ "insanehong <[email protected]>",
  "jackpoll <[email protected]>",
  "Jake Mc <[email protected]>",
+ "JBYoshi <[email protected]>",
+ "Joey Parrish <[email protected]>",
  "John Tantalo <[email protected]>",
  "John Yanarella <[email protected]>",
  "Jon Buckley <[email protected]>",
+ "Josh Goldberg <[email protected]>",
+ "Junki-Ishida <[email protected]>",
  "Kendall Buchanan <[email protected]>",
  "Lee Treveil <[email protected]>",
  "leonardo <[email protected]>",
  "Levente Balogh <[email protected]>",
  "Liam Quinn <[email protected]>",
  "Lithin <[email protected]>",
+ "ll-syber <[email protected]>",
  "Loris Guignard <[email protected]>",
  "Lukas Drgon <[email protected]>",
  "Lukas Eipert <[email protected]>",
  "Malash <[email protected]>",
  "Martynas <[email protected]>",
+ "Masahiko Sato <[email protected]>",
  "Matt Brophy <[email protected]>",
- "Max Maurer <maxemanuel.maurer@gmail.com>",
+ "Matthew Origer <karatecowboy@gmail.com>",
  "Maximilian Haupt <[email protected]>",
+ "Max Maurer <[email protected]>",
+ "Max Nordlund <[email protected]>",
  "Michael Hess <[email protected]>",
+ "MimyyK <[email protected]>",
  "naoh <[email protected]>",
+ "Nicholas Ionata <[email protected]>",
+ "Nikhil Motiani <[email protected]>",
  "Nik Rolls <[email protected]>",
- "Nikhil Motiani <nikhil.m@247-inc.com>",
+ "nionata <n.ionata129@gmail.com>",
  "niris <[email protected]>",
  "Nobuo Okada <[email protected]>",
+ "o.drapeza <[email protected]>",
  "otakuSiD <[email protected]>",
+ "patrick-nurt <[email protected]>",
+ "Pavel Studeny <[email protected]>",
  "Peter Dave Hello <[email protected]>",
  "philippsimon <[email protected]>",
  "Pieter Hendrickx <[email protected]>",
  "Piper Chester <[email protected]>",
+ "Queen Vinyl Darkscratch <[email protected]>",
+ "Raine Makelainen <[email protected]>",
+ "Raman Savaryn <[email protected]>",
  "Robert Tod <[email protected]>",
+ "roman.savarin <[email protected]>",
  "Ron Korland <[email protected]>",
  "Ross Noble <[email protected]>",
+ "ruicong <[email protected]>",
  "Sandro Sonntag <[email protected]>",
  "sgautrea <[email protected]>",
  "Shane Gautreau <[email protected]>",
  "Shane Thacker <[email protected]>",
- "shchotse <[email protected]>",
+ "Shreedhar <[email protected]>",
  "Simon Eisenmann <[email protected]>",
  "Simon Lang <[email protected]>",
  "Stiekel <[email protected]>",
+ "sUP <[email protected]>",
  "Sylvain Gizard <[email protected]>",
  "szchenghuang <[email protected]>",
+ "Tanguy Krotoff <[email protected]>",
+ "Tony Tomarchio <[email protected]>",
+ "Ulrich Schmidt <[email protected]>",
  "Vadim Kurachevsky <[email protected]>",
+ "Yılmaz <[email protected]>",
+ "yuanyang <[email protected]>",
  "Yun Young-jin <[email protected]>",
- "Insanehong <insae.hong@navercorp.com>"
+ "Zach Bjornson <zbbjornson@gmail.com>"
  ],
  "main": "src/ua-parser.js",
  "scripts": {