diff --git a/.mailmap b/.mailmap
index f922006bf804b..a8755c8390807 100644
--- a/.mailmap
+++ b/.mailmap
@@ -19,6 +19,7 @@
 Alexis J. Vuillemin <alexis.j.vuillemin@gmail.com>
 Andreas Tolfsen <ato@mozilla.com> <andreastt@opera.com>
 Andreas Tolfsen <ato@mozilla.com> Andreas Tolf Tolfsen
+Andreas Tolfsen <ato@mozilla.com> <Andreas Tolfsen>
 Aslak Hellesøy <aslak.hellesoy@gmail.com> Aslak Hellesoy
 Chethana Paniyadi <cpaniyad@cpaniyadi-wsl.internal.salesforce.com> CHETANA PANIYADI
 Daniel Davison <daniel.jj.davison@gmail.com> ddavison
@@ -42,3 +43,14 @@ Simon Stewart <simon.m.stewart@gmail.com> Simon M Stewart
 Stuart Knightly <stuidge@gmail.com>
 Yi Zeng <yi.zeng.dev@gmail.com> Yi Zeng <yi.zeng.nz@gmail.com>
 Jane Tymoschuk <tymoschuk.jane@gmail.com> Jane Tymoschuk <evgeniya.tymoschuk+scrapers@kredito.de>
+Anton Usmansky <cody0@yandex-team.ru> <j0tunn@ya.ru>
+François Reynaud <francois.reynaud@gmail.com> <francois.reynaud@ebay.com>
+François Reynaud <francois.reynaud@gmail.com> Francois Reynaud <francois.reynaud@gmail.com>
+Jason Juang <juangj@gmail.com> <juangj@google.com>
+Joshua Bruning <joshbruning@gmail.com> <joshbruning@google.com>
+Krishnan Mahadevan <krishnan.mahadevan1978@gmail.com> <krmahadevan@users.noreply.github.com>
+Titus Fortner <titusfortner@gmail.com> <titus.fortner@gmail.com>
+Titus Fortner <titusfortner@gmail.com> <titus.fortner@blackbaud.com>
+Titus Fortner <titusfortner@gmail.com> <titusfortner@users.noreply.github.com>
+Titus Fortner <titusfortner@gmail.com> <titus.fortner@google.com> 
+Titus Fortner <titusfortner@gmail.com> titusfortner <titusfortner@gmail.com>
diff --git a/AUTHORS b/AUTHORS
index 45d2c3dfe4475..a991276f38c96 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,9 +1,15 @@
 Aaron Evans <aevans@ancestry.com>
+Abhijeet Kasurde <akasurde@redhat.com>
 Adam Goucher <adam_goucher@hotmail.com>
 Adi Roiban <adi.roiban@chevah.com>
+Ahmed Ashour <asashour@yahoo.com>
+AJ <anandj82@gmail.com>
 Ajay Kemparaj <ajaykemparaj@gmail.com>
+Akhil Lb <akhil.lb1@gmail.com>
+Alan Baird <alan.baird@livingsocial.com>
 Alberto Scotto <scotto.alberto.86@gmail.com>
 Alex Henrie <alexhenrie24@gmail.com>
+Alex Rodionov <p0deje@gmail.com>
 Alex Savchuk <a.u.savchuk@gmail.com>
 Alexander Bayandin <a.bayandin@gmail.com>
 Alexandr Savchuk <a.u.savchuk@gmail.com>
@@ -11,89 +17,146 @@ Alexandre Abreu <abreu_alexandre@hotmail.com>
 Alexei Barantsev <barancev@gmail.com>
 Alexis J. Vuillemin <alexis.j.vuillemin@gmail.com>
 Alexis Vuillemin
+Alice Yang <alice@airtime.com>
 Amitabh Saikia
+Anand Jayaram <anandj82@gmail.com>
 Andras Hatvani <andras.hatvani@gmail.com>
 Andreas Tolfsen <ato@mozilla.com>
 Andrei Solntsev <andrei.solntsev@gmail.com>
 Andrey Botalov <botalov.andrey@gmail.com>
 Andy Duncan <aduncan@thoughtworks.com>
 anonymous_sdet <anonymoussdet@gmail.com>
+Anton Usmansky <cody0@yandex-team.ru>
 Anton Vynogradenko <restuta8@gmail.com>
+arnonax <arnonaxelrod@hotmail.com>
 Artem Koshelev <artkoshelev@yandex-team.ru>
 Artur Orlov <wirewit@rohrpost>
 Aslak Hellesøy <aslak.hellesoy@gmail.com>
 AutomatedTester <david.burns@theautomatedtester.co.uk>
 Baran Ozgul <baran.ozgul@test.com>
 Ben Congleton <ben@olark.com>
+Ben Lamm <benlamm25@gmail.com>
+Ben Sedat <bsedat@tinfoilsecurity.com>
 bhkwan <bhkwan@example.com>
+Bill Agee <billagee@gmail.com>
 bob <bob@example.com>
+Bob Baron <rdbaron@gmail.com>
+Bob Lubecker <thebobalu@gmail.com>
+Bohdan Tkachenko <bohdan@tkachenko.io>
+bootstraponline <code@bootstraponline.com>
 Brandon Williams <williamsbdev@gmail.com>
+Brendan Mannix <bmannix@gmail.com>
 Bret Pettichord <bret@pettichord.com>
 Brett Porter <brett@apache.org>
+Brett Randall <javabrett@gmail.com>
 Calin Marina <calin.marina@gmail.com>
 Carlos Villela
+Carson McDonald <carson@ioncannon.net>
 cezarelnazli <cezarelnazli@users.noreply.github.com>
 ChanMin Kim <kcm1700@gmail.com>
+Charles Lavery <clavery@pixelmedia.com>
 Charles Thomas <ch@rlesthom.as>
 Chethana Paniyadi <cpaniyad@salesforce.com>
 chris <deadletter@aol.com>
 Chris Block <chris.block@gmail.com>
+Chris Gamache <cgamache@gmail.com>
 Chris Martin <ch.martin@gmail.com>
+Chris Mohr <chris.mohr@gmail.com>
+ColinF <cfletch@us.ibm.com>
 Corey Goldberg <cgoldberg@gmail.com>
 Corey Schooler <cschooler@cerner.com>
+Craig Nishina <craig.nishina@gmail.com>
+customcommander <hello@spinjs.com>
 Dan Fabulich <dan@fabulich.com>
 Daniel Bengtsson <danielb@opera.com>
+Daniel Boelzle [:dbo] <dbo@boelzle.org>
 Daniel Davison <daniel.jj.davison@gmail.com>
 Daniel Fackrell <dfackrell@bluehost.com>
+Daniel Hahler <git@thequod.de>
 Daniel Wagner-Hall <dawagner@gmail.com>
 Danilo Bargen <mail@dbrgn.ch>
 Darrell DeBoer <darrell.deboer@gmail.com>
 Darren Cotterill <dcotterill@thoughtworks.com>
+Darrin Cherry <darrinlc@Gmail.com>
 Dave Hoover <dave.hoover@gmail.com>
 Dave Hunt <dave.hunt@gmail.com>
 David Burns <david.burns@theautomatedtester.co.uk>
+David Fischer <david.fischer.ch@gmail.com>
 David Kemp <dkemp@thoughtworks.com>
 David Lai <david@wiredrive.com>
 David Sanders <dsanders11@ucsbalum.com>
 David Wang
+David Zhu <hdavidzhu@users.noreply.github.com>
+Denis Demchenko <lancedikson@gmail.com>
+Derrick Isaacson <derrick@lucidchart.com>
 Dharrya <dharrya@gmail.com>
 Dima Kovalenko <dima@groupon.com>
 Dominik Dary <ddary@ebay.com>
 Dominik Rauch <dominik.rauch@rubicon.eu>
+Doug Simmons <doug@mach6.net>
 Dounia Berrada <berrada@google.com>
 Dylan Lacey <github@dylanlacey.com>
+Dylan Semler <dsem@users.noreply.github.com>
 Eberhard Beilharz <eb1@sil.org>
 Edi Weissmann <edi.weissmann@gmail.com>
+Edward Ned Harvey <edward.harvey@conceptblossom.com>
 Ela Makiej <eplaszczyca@opera.com>
+Eli Flanagan <efx@users.noreply.github.com>
+Elias Faxö <p950iaf@fspa.myntet.se>
 Ellis Percival <ellis.percival@imagination.com>
+Enrique Daimiel <kdaimiel@gmail.com>
 eoff <eoff@yandex-team.ru>
 Eran Messeri <eran.mes@gmail.com>
 Eric Allen <ericpallen@gmail.com>
 Eric Plaster <eric.plaster@mutualmobile.com>
 Erik Beans <ebeans@google.com>
+Erik E. Beerepoot <erikbeerepoot@hush.com>
+Erik Kuefler <ekuefler@gmail.com>
+evgeniyat <evgeniya.tymoschuk+scrapers@kredito.de>
+Felipe Knorr Kuhn <git@knorrium.info>
 Florian Apolloner <florian@apolloner.eu>
-Francois Reynaud <francois.reynaud@gmail.com>
-freynaud <francois.reynaud@ebay.com>
+Florian Zipperle <zipperle@users.noreply.github.com>
+Francis Bergin <bergin.francis@gmail.com>
+François Freitag <francois.freitag@polyconseil.fr>
+François JACQUES <hypnoce@donarproject.org>
+François Reynaud <francois.reynaud@gmail.com>
+Fumiaki MATSUSHIMA <mtsmfm@gmail.com>
+Gestalt LUR <gestapolur@users.noreply.github.com>
+Giorgos Tzampanakis <giorgos.tzampanakis@gmail.com>
+Glib Briia <glib.briia@gmail.com>
 Godefroid Chapelle
-Google, Inc
+Gopal Patel <nixme@stillhope.com>
+Greg Hogan <gregjhogan@gmail.com>
 Gregory Block <gregory.block@gmail.com>
+gregory.kleiner@accolade.com <gregory.kleiner@accolade.com>
+Grzegorz Halat <grzegorz.halat@gmail.com>
 Harry <hjwp2@cantab.net>
 Haw-bin Chai <hbchai@gmail.com>
+Herryanto Siatono <herryanto@gmail.com>
 Iain Dawson <iain@colons.co>
+Ian Lesperance <ian@elliterate.com>
 ifland <ifland@gmail.com>
 Immanuel Hayden <immanuel.hayden@gmail.com>
+Innokenty Shuvalov <innocentshuvalov@gmail.com>
+Isaul Vargas <isaulv@gmail.com>
 Ivan De Marino <detronizator@gmail.com>
 jamadam <sugama@jamadam.com>
 James Cooper
 James Strachen
 Jan Weitz <jan@iosphere.de>
+Jane T <tymoschuk.jane@gmail.com>
 Jari Bakken <jari.bakken@gmail.com>
+Jason <jwatt@salesforce.com>
+Jason Anderson <diurnalist@gmail.com>
 Jason Carr <jcarr@saucelabs.com>
 Jason Huggins <jrhuggins@gmail.com>
-Jason Juang <juangj@google.com>
+Jason Juang <juangj@gmail.com>
 Jason Leyba <jmleyba@gmail.com>
+Jason Parry <jasonsparry@mac.com>
+Jason Watt <jasno@wattisup.com>
 Javier Candeira <javier@candeira.com>
 Jayakumar Chinnappan <jayakumareee21@gmail.com>
+Jayme <kalkehcoisa@users.noreply.github.com>
 Jean-Francois Roche
 Jeff Xiong <gigix1980@gmail.com>
 Jennifer Bevan <jbevan@google.com>
@@ -104,99 +167,168 @@ Jie Tina Wang <jwang@example.com>
 Jim Evans <james.h.evans.jr@gmail.com>
 Jim van Musscher <jim.van.musscher@gmail.com>
 jmuramatsu <jmuramatsu@gmail.com>
+Joe Lencioni <joe.lencioni@gmail.com>
 Joe Walnes
 Joel Hillacre <joel@403forbidden.ca>
+Johan Lorenzo <jlorenzo@mozilla.com>
+John Barbuto <john.barbuto@indiegogo.com>
+John Comeau <jcomeauictx@users.noreply.github.com>
+John Dorlus <jsdorlus@gmail.com>
+John J. Barton <johnjbarton@google.com>
 Jon Spalding
 Jonah Stiennon <jonahss@gmail.com>
 Jonatan Kronqvist <jonatan@vaadin.com>
 josephg <josephg@gmail.com>
+josh <joshua.m.grant@gmail.com>
+Joshua Bruning <joshbruning@gmail.com>
+Joshua Grant <joshua.m.grant@gmail.com>
 Julian Harty <julianharty@gmail.com>
 Julie Ralph <ju.ralph@gmail.com>
 Julien Phalip <jphalip@gmail.com>
+Justin Tulloss <justin.tulloss@gmail.com>
+Justine Tunney <jtunney@gmail.com>
 Ken Kania <kkania@chromium.org>
 Kevin Menard <kevin@nirvdrum.com>
 Kevin Menard <nirvdrum@gmail.com>
 kjleftin <kjleftin@example.com>
+Krishnan Mahadevan <krishnan.mahadevan1978@gmail.com>
 Kristian Rosenvold <krosenvold@apache.org>
+Krzysztof Księżyk <crs@poczta.fm>
+kuhtich <kuhtich@yandex-team.ru>
 kurniady@gmail.com <kurniady@gmail.com>
+Laura <snailtsunami@gmail.com>
+Laurence Rowe <l@lrowe.co.uk>
 Leo Laskin <llaskin@gmail.com>
+Levi Noecker <levi-rs@users.noreply.github.com>
 lhuang <lhuang@example.com>
+lsowen <lowen@misoenergy.org>
 Luke Inman-Semerau <luke.semerau@gmail.com>
 lukec <lukec@example.com>
 Magnus E. Halvorsen <mhalv@nets.eu>
 Malcolm Rowe
+Manoj Kumar <manoj9788@gmail.com>
+Marc Fisher <fisherii@google.com>
 Marc Guillemot
+marcotcr <marcotcr@gmail.com>
+Marcus Merrell <mmerrell@gmail.com>
+Mark Banner <standard8@mozilla.com>
 Mark Collin <mark.collin@lazeryattack.com>
 Mark Watson <watsonmw@gmail.com>
+Marvin Ojwang <mojwang@netflix.com>
 Mathias Kresin <m@kresin.me>
+Mathias Rangel Wulff <m@rawu.dk>
 Michael Klepikov <klm@google.com>
 Michael P. Jung <michael.jung@terreon.de>
 Michael Tamm <michael.tamm2@gmail.com>
+Michael Zhou <zhoumotongxue008@gmail.com>
 michael.tamm <michael.tamm@optivo.de>
+Michał Herda <phoe@openmailbox.org>
 Michele Sama
 Mike Melia <mikemelia@gmail.com>
 Mike Roberts <mike.b.roberts@gmail.com>
 Mike Williams <mdub@dogbiscuit.org>
 Mikhail Fedosov <tbs.micle@gmail.com>
 Miki Tebeka <miki.tebeka@gmail.com>
+Milan Falešník <mfalesni@redhat.com>
 Mirko Nasato
+mohammadsavadkuhi <physitime@gmail.com>
 mpurland <mpurland@example.com>
 Muthu Kannan
+Nathan Isom <neeasade@users.noreply.github.com>
 Nelson Sproul <nsproul@bea.com>
 Nick Schonning <nschonni@gmail.com>
+Nik Nyby <nnyby@columbia.edu>
 Noel Gordon
 Nowell Strite <nowell@strite.org>
 Nozomi Ito <nozomi.ito@trident-qa.com>
 no_author <no_author@gmail.com>
+Olivier SCHNEIDER <olivier.schneider@opengroupware.ch>
 Ondřej Čertík <ondrej.certik@gmail.com>
 Pat Tullmann <pt@bebop.co>
 Patrick Gansterer <paroga@paroga.com>
 Patrick Lightbody <plightbo@gmail.com>
 Paul G Webster <paul.g.webster@googlemail.com>
 Paul Hammant <phammant@gmail.com>
+Pavel Lobashov <ShockwaveNN@gmail.com>
 Perryn Fowler <pezlists@gmail.com>
+petruc <petruc@microsoft.com>
+Philipp Hancke <fippo@goodadvice.pages.de>
 Philippe Hanrigou <philippe.hanrigou@gmail.com>
+phoenix384 <phoenix384@gmx.de>
 Piotr Witoslawski <pwitoslawski@opera.com>
 Pydi Chandra <pydi.chandra@gmail.com>
+Qays H. Poonawala <qayshp@gmail.com>
+Rafael Chavez <rafchavez3@gmail.com>
+Ram Rachum <ram@rachum.com>
 rbri <rbri@rbri.de>
 rchatley <rchatley@gmail.com>
 rchatley@gmail.com <rchatley@gmail.com>
+Remco <remcowesterhoud@msn.com>
 richard.hines <richard.hines@hp.com>
+RichCrook <richcrook@yahoo.com>
+Rob Richardson <robrich@robrich.org>
 Rob Wu <gwnRob@gmail.com>
+Robert Elliot <rob@lidalia.org.uk>
 Robin Stocker <rstocker@atlassian.com>
 rompic <blog@pickl.eu>
 Rory Craig-Barnes <rcraigbarnes@blackberry.com>
+Rouke Broersma <Mobrockers@users.noreply.github.com>
 Rune Flobakk
+Russ Amos <rra@google.com>
+Ryan Fitzpatrick <ryan.fitzpatrick@inin.com>
 Ryan Wilcox <rwilcox@thoughtworks.com>
 Ryszard Perkowski <usultis@gmail.com>
+Sam Uong <samuong@chromium.org>
 Samit Badle <samit.badle@gmail.com>
+Sankha Narayan Guria <sankha93@gmail.com>
 Santiago Suarez Ordoñez <santiycr@gmail.com>
+Sebastian Monte <sebastian.h.monte@gmail.com>
+Sergey Chipiga <svchipiga@yandex-team.ru>
 Sergey Tikhomirov <tichomirovsergey@gmail.com>
 Seva Lotoshnikov <sevalo@google.com>
+Shan <shan.anand@gmail.com>
 shin <shin@example.com>
 Shinya Kasatani <shinya@example.com>
 Simon Stewart <simon.m.stewart@gmail.com>
 smhc <shanehird@gmail.com>
+Snail <snail@solitarysnail.com>
+Sripathi Pai <sripathi@roxtr.com>
 Stephen Kuenzli <skuenzli@shutterfly.com>
 Steve Brown <steve@steve-Lenovo-IdeaPad-U260.(none)>
+Steve Smith <stvsmth@gmail.com>
+Stoyan Dimkov <stoyan.dimkov@gmail.com>
 Stuart Knightly <stuidge@gmail.com>
 sugama <sugama@jamadam.com>
+Tamás Buka <buka86@gmail.com>
 Terence Haddock
 Thomas Grainger <tagrain@gmail.com>
 Thomas Walpole <twalpole@gmail.com>
+Thunderforge <wjherrmann@gmail.com>
 timm-permeance <tim.myerscough@permeance.com.au>
 Timofey Vasenin <timofey.vasenin@gmail.com>
-Titus Fortner <titus.fortner@blackbaud.com>
+Timur Zolotuhin <tzolotuhin@gmail.com>
+tirana <anatoli.kuzmin@gmail.com>
+Titus Fortner <titusfortner@gmail.com>
 Tobias Lidskog <tobias@lidskog.se>
+Toilal <toilal.dev@gmail.com>
+tommywo <tommywo@users.noreply.github.com>
+Tony Hignett <tony.hignett@scivisum.co.uk>
 tporeba <tporeba@gmail.com>
+trabulmonkee <mike.millgate@gmail.com>
 ttanaka <ttanaka@cybernet.co.jp>
 Ulrich Buchgraber <ulrich.b@gmx.at>
+Valery Yatsynovich <valfirst@yandex.ru>
 Varun Menon <mr.varun.menon@gmail.com>
 vergiliu <vergiliu@gmail.com>
+Victor Tang <vtange@users.noreply.github.com>
 Vincent Ladeuil <vila+github@canonical.com>
+Vitaliy Potapov <noginsk@rambler.ru>
 Vyvyan Codd
 WORKSTATION02 <clz.livio@gmail.com>
 wpc <wpc@example.com>
 Yi Zeng <yi.zeng.dev@gmail.com>
+Zeki Mokhtarzada <zekitm@gmail.com>
+Ziyu <odduid@gmail.com>
 Zoltar - Knower of All
 zsong <zsong@example.com>
+Ákos Lukács <AkosLukacs42@gmail.com>