diff --git a/.mailmap b/.mailmap
index 8400b36a6c9..78da54872c0 100644
--- a/.mailmap
+++ b/.mailmap
@@ -6,6 +6,7 @@ Alexey Kupershtokh <alexey.kupershtokh@gmail.com> <wicked@alawar.com>
 Alexis Campailla <alexis@janeasystems.com> <orangemocha@github.com>
 Alexis Sellier <self@cloudhead.net>
 Alexis Sellier <self@cloudhead.net> <alexis@cloudhead.io>
+Andy Bettisworth <andy.bettisworth@accreu.com>
 Aria Stewart <aredridel@dinhe.net> <aredridel@nbtsc.org>
 Arlo Breault <arlolra@gmail.com>
 Artem Zaytsev <a.arepo@gmail.com>
@@ -19,15 +20,20 @@ Bert Belder <bertbelder@gmail.com> <piscisaureus@Berts-MacBook-Pro.local>
 Brandon Benvie <brandon@bbenvie.com> <brandon@brandonbenvie.com>
 Brian White <mscdex@mscdex.net>
 Brian White <mscdex@mscdex.net> <mscdex@gmail.com>
+Caleb Boyd <caleb.boyd@gmail.com>
+Charles <ineedpracticing@gmail.com> <cydjudge@users.noreply.github.com>
 Chew Choon Keat <choonkeat@gmail.com>
 Charles Rudolph <charles.rudolph@originate.com>
+Claudio Rodriguez <cjrodr@yahoo.com> <cr@fansworld.tv>
 Colin Ihrig <cjihrig@gmail.com>
 Christopher Lenz <cmlenz@gmail.com> <chris@lamech.local>
+Dan Kaplun <dbkaplun@gmail.com> <dan@beardtree.com>
 Daniel Berger <code+node@dpbis.net>
 Daniel Chcouri <333222@gmail.com>
 Daniel Gröber <darklord@darkboxed.org>
 Daniel Gröber <darklord@darkboxed.org> <dxld@darkboxed.org>
 Daniel Pihlström <sciolist.se@gmail.com>
+Danny Nemer <hi@dannynemer.com> <DannyNemer@users.noreply.github.com>
 Dave Pacheco <dap@joyent.com> <dap@cs.brown.edu>
 David Siegel <david@artcom.de> <david.siegel@artcom.de>
 Domenic Denicola <domenic@domenicdenicola.com>
@@ -37,6 +43,8 @@ Einar Otto Stangvik <einaros@gmail.com>
 Elliott Cable <me@ell.io>
 EungJun Yi <semtlenori@gmail.com>
 Evan Larkin <evan.larkin.il.com> <evan.larkin.iit@gmail.com>
+Evan Lucas <evanlucas@me.com> <evan@btc.com>
+Evan Lucas <evanlucas@me.com> <evan.lucas@help.com>
 Farid Neshat <FaridN_SOAD@yahoo.com>
 Fedor Indutny <fedor@indutny.com> <fedor.indutny@gmail.com>
 Felix Böhm <felixboehm55@googlemail.com> <me@feedic.com>
@@ -48,23 +56,29 @@ Gabriel de Perthuis <g2p.code@gmail.com>
 Gil Pedersen <git@gpost.dk> <github@gpost.dk>
 Henry Chin <hheennrryy@gmail.com>
 Herbert Vojčík <herby@mailbox.sk>
+Icer Liang <liangshuangde@163.com> <wizicer@users.noreply.github.com>
 Igor Soarez <igorsoarez@gmail.com>
 Igor Zinkovsky <igorzi@microsoft.com>
 Isaac Z. Schlueter <i@izs.me>
 Isaac Z. Schlueter <i@izs.me> <i@foohack.com>
 Jake Verbaten <raynos2@gmail.com>
 James Hartig <fastest963@gmail.com> <james.hartig@grooveshark.com>
+Jan Krems <jan.krems@gmail.com> <jan.krems@groupon.com>
 Jered Schmidt <tr@nslator.jp>
 Jeremiah Senkpiel <fishrock123@rocketmail.com>
+Jerry Chin <qinjia@outlook.com>
 Joe Shaw <joe@joeshaw.org> <joeshaw@litl.com>
 Johan Bergström <bugs@bergstroem.nu>
 Johan Dahlberg <jfd@distrop.com> <dahlberg.johan@gmail.com>
 Johann Hofmann <git@johann-hofmann.com>
 Jonas Pfenniger <jonas@pfenniger.name> <jonas@stvs.ch>
 Jonathan Ong <jonathanrichardong@gmail.com> <jonathanong@users.noreply.github.com>
+Jonathan Persson <persson.jonathan@gmail.com> <jonathan.persson@creuna.se>
 Jonathan Rentzsch <jwr.git@redshed.net>
 Josh Erickson <josh@snoj.us>
 Joshua S. Weinstein <josher19@users.sf.net>
+Junliang Yan <john.yan1019@gmail.com>
+Junliang Yan <jyan@ca.ibm.com> <jyan@ca.ibm.ca>
 Jérémy Lal <kapouer@melix.org>
 Jérémy Lal <kapouer@melix.org> <holisme@gmail.com>
 Kai Sasaki Lewuathe <sasaki_kai@lewuathe.sakura.ne.jp>
@@ -81,6 +95,8 @@ Malte-Thorben Bruns <skenqbx@gmail.com>
 Malte-Thorben Bruns <skenqbx@googlemail.com>
 Marcin Cieślak <saper@marcincieslak.com>
 Marcin Cieślak <saper@marcincieslak.com> <saper@saper.info>
+Marti Martz <thalamew@q.com>
+Martial James Jefferson <martial.jefferson@gmail.com>
 Mathias Pettersson <mape@mape.me>
 Matthew Lye <muddletoes@hotmail.com>
 Michael Bernstein <michaelrbernstein@gmail.com>
@@ -95,16 +111,20 @@ Nicholas Kinsey <pyrotechnick@feistystudios.com>
 Nikolai Vavilov <vvnicholas@gmail.com>
 Onne Gorter <onne@onnlucky.com>
 Paul Querna <pquerna@apache.org> <paul@querna.org>
+Peter Flannery <pflannery@users.noreply.github.com>
+Phillip Johnsen <johphi@gmail.com> <phillip.johnsen@finn.no>
 Ray Morgan <rmorgan@zappos.com>
 Ray Solomon <raybsolomon@gmail.com>
 Raymond Feng <enjoyjava@gmail.com> <raymond@strongloop.com>
 Rick Olson <technoweenie@gmail.com>
 Roman Klauke <romaaan.git@gmail.com> <romankl@users.noreply.github.com>
 Roman Reiss <me@silverwind.io>
+Ron Korving <rkorving@wizcorp.jp>
 Ryan Dahl <ry@tinyclouds.org>
 Ryan Emery <seebees@gmail.com>
 Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
 Sam Mikes <smikes@cubane.com>
+Sam P Gallagher-Bishop <samgallagherb@gmail.com> <SPGB@users.noreply.github.com>
 Sam Shull <brickysam26@gmail.com> <brickysam26@samuel-shulls-computer.local>
 Sam Shull <brickysam26@gmail.com> <sshull@squaremouth.com>
 Sambasiva Suda <sambasivarao@gmail.com>
diff --git a/AUTHORS b/AUTHORS
index 3e80bf26e55..5ab61aebf20 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -517,7 +517,7 @@ Cam Swords <cam.swords@gmail.com>
 Paul Loyd <pavelko95@gmail.com>
 Benjamin Waters <benjamin.waters@outlook.com>
 Lev Gimelfarb <lev.gimelfarb@gmail.com>
-pflannery <pflannery@users.noreply.github.com>
+Peter Flannery <pflannery@users.noreply.github.com>
 Tuğrul Topuz <tugrultopuz@gmail.com>
 Lorenz Leutgeb <lorenz.leutgeb@gmail.com>
 ayanamist <contact@ayanamist.com>
@@ -565,7 +565,7 @@ Feross Aboukhadijeh <feross@feross.org>
 Refael Ackermann <refack@gmail.com>
 Taojie <taojie.hjp@taobao.com>
 Greg Sabia Tucker <greg@tucke.rs>
-Dan Kaplun <dan@beardtree.com>
+Dan Kaplun <dbkaplun@gmail.com>
 Colin Ihrig <cjihrig@gmail.com>
 Greg Sabia Tucker <greg@narrowlabs.com>
 Mark Stosberg <mark@rideamigos.com>
@@ -580,7 +580,7 @@ Roman Klauke <romaaan.git@gmail.com>
 Xavi Magrinyà <xavi.mb89@gmail.com>
 Euan <euank@euank.com>
 Ed Morley <emorley@mozilla.com>
-Charles <cydjudge@users.noreply.github.com>
+Charles <ineedpracticing@gmail.com>
 Jan Krems <jan.krems@gmail.com>
 Fred K. Schott <fschott@box.com>
 Chris Dickinson <christopher.s.dickinson@gmail.com>
@@ -648,7 +648,7 @@ Bryce Kahle <bkahle@gmail.com>
 The Gitter Badger <badger@gitter.im>
 Brendan Ashworth <squirrelslikeacorns@gmail.com>
 Jose Luis Rivas <me@ghostbar.co>
-Evan Lucas <evan@btc.com>
+Evan Lucas <evanlucas@me.com>
 Vincent Weevers <mail@vincentweevers.nl>
 Tyler Kellen <tyler@sleekcode.net>
 Evan Torrie <evan.torrie@yahoo.com>
@@ -669,7 +669,6 @@ Calvin Metcalf <calvin.metcalf@state.ma.us>
 Eric Mill <eric@konklone.com>
 pkcs <pkcs@gmx.com>
 James M Snell <jasnell@gmail.com>
-Evan Lucas <evanlucas@me.com>
 Cydox <farr.janhendrik@aol.de>
 Steven Rockarts <srockarts@invidi.com>
 Vladimir Guguiev <wizardzloy@gmail.com>
@@ -690,7 +689,7 @@ Glen Keane <glenkeane.94@gmail.com>
 Xiaowei Li <446240525@qq.com>
 toastynerd <tylermorgan86@gmail.com>
 Todd Kennedy <todd@selfassembled.org>
-Icer Liang <wizicer@users.noreply.github.com>
+Icer Liang <liangshuangde@163.com>
 Stephen Belanger <admin@stephenbelanger.com>
 Jeremiah Senkpiel <fishrock123@rocketmail.com>
 Brendan Ashworth <brendan.ashworth@me.com>
@@ -794,7 +793,7 @@ Oleksandr Chekhovskyi <oleksandr.chekhovskyi@hansoft.com>
 Tristian Flanagan <tflanagan@datacollaborative.com>
 Mike Tunnicliffe <mike.tunnicliffe@uk.ibm.com>
 Ionică Bizău <bizauionica@gmail.com>
-Danny Nemer <DannyNemer@users.noreply.github.com>
+Danny Nemer <hi@dannynemer.com>
 Sven Slootweg <jamsoftgamedev@gmail.com>
 Dmitry Vasilyev <vaseker@gmail.com>
 Malcolm Ahoy <malcolmahoy@gmail.com>
@@ -810,5 +809,64 @@ Michał Gołębiowski <m.goleb@gmail.com>
 Johann Hofmann <git@johann-hofmann.com>
 Charles Rudolph <charles.rudolph@originate.com>
 Dave Eddy <dave@daveeddy.com>
+Justin Chase <justin@evolvelabs.com>
+Jeremy Whitlock <jwhitlock@apache.org>
+Rod Machen <mail@rodmachen.com>
+Martial James Jefferson <martial.jefferson@gmail.com>
+Doug Shamoo <doug.shamoo@gmail.com>
+Junliang Yan <jyan@ca.ibm.com>
+Dave Hodder <dmh@dmh.org.uk>
+Jason Karns <jason.karns@gmail.com>
+Balázs Galambosi <galambalazs@yahoo.co.uk>
+David Boivin <dave.a.boivin@gmail.com>
+Liang-Chi Hsieh <viirya@appier.com>
+Timothy Gu <timothygu99@gmail.com>
+Fábio Santos <fabiosantosart@gmail.com>
+Myles Borins <mborins@us.ibm.com>
+Jonas Dohse <jonas@dohse.ch>
+Коренберг Марк <mark@ideco.ru>
+Caleb Boyd <caleb.boyd@gmail.com>
+Yuval Brik <yuval@brik.org.il>
+Claudio Rodriguez <cjrodr@yahoo.com>
+Ido Ben-Yair <idoby@wix.com>
+Kyle Smith <kyle.r.smiff@gmail.com>
+Marti Martz <thalamew@q.com>
+Stefan Budeanu <stefan@budeanu.com>
+Emily Aviva Kapor-Mater <emily@emilyaviva.com>
+Sam P Gallagher-Bishop <samgallagherb@gmail.com>
+David Woods <david@birnamdesigns.com>
+Ashok Suthar <coderatlabs@gmail.com>
+Ömer Fadıl Usta <omerusta@gmail.com>
+Jerry Chin <qinjia@outlook.com>
+Hemanth.HM <hemanth.hm@gmail.com>
+Hugues Malphettes <hmalphettes@gmail.com>
+Tyler Henkel <tylerhenkel@hotmail.com>
+Zheng Chaoping <zbinlin@gmail.com>
+Ashley Williams <ashley666ashley@gmail.com>
+Bryan English <bryan@bryanenglish.com>
+Devin Nakamura <devinn@ca.ibm.com>
+Vladimir Varankin <nek.narqo+git@gmail.com>
+Manuel B <baslr@users.noreply.github.com>
+Jesse McCarthy <git_commits@jessemccarthy.net>
+Craig Cavalier <craigcav@gmail.com>
+Michael Cornacchia <cornacch@ca.ibm.com>
+Markus Tzoe <chou.marcus@gmail.com>
+Martin Forsberg <git@martinforsberg.se>
+Carl Lei <xecycle@gmail.com>
+Lewis Cowper <lewis.cowper@googlemail.com>
+Bryon Leung <teslaslegacy@gmail.com>
+Chunyang Dai <chunyang.dai@intel.com>
+Jonathan Persson <persson.jonathan@gmail.com>
+Dave <dave@jut.io>
+Luigi Pinca <luigipinca@gmail.com>
+Peter A. Bigot <pab@pabigot.com>
+Zirak <zirakertan@gmail.com>
+Scott Buchanan <sbuchanan@ebay.com>
+Rebecca Turner <rebecca@npmjs.com>
+Bryce Baril <bryce@ravenwall.com>
+Super Zheng <superzheng@tencent.com>
+Rafał Pocztarski <r.pocztarski@gmail.com>
+Michael Ruddy <mruddybtc@gmail.com>
+Andy Bettisworth <andy.bettisworth@accreu.com>
 
 # Generated by tools/update-authors.sh