diff --git a/.mailmap b/.mailmap
index 16c9bf1ea21..0fffffad9ea 100644
--- a/.mailmap
+++ b/.mailmap
@@ -2,6 +2,7 @@ Aaron Bieber <aaron@bolddaemon.com> <deftly@gmail.com>
 Aaron Heckmann <aaron.heckmann@gmail.com> <aaron.heckmann+github@gmail.com>
 Aayush Ahuja <aayush.a@directi.com> aayush.a <aayush.a@directi.com>
 Abe Fettig <abefettig@gmail.com> <abe@fettig.net>
+Abhimanyu Vashisht <abhimanyuvashisht.av@gmail.com>
 Akito Ito <akito0107@gmail.com> <akito_ito@r.recruit.co.jp>
 Alejandro Estrada <estrada9166@gmail.com>
 Alejandro Estrada <estrada9166@gmail.com> <estrada9166@hotmail.com>
@@ -17,7 +18,9 @@ Alexis Campailla <alexis@janeasystems.com> <orangemocha@github.com>
 Alexis Sellier <self@cloudhead.net>
 Alexis Sellier <self@cloudhead.net> <alexis@cloudhead.io>
 Alfred Cepeda <AlfredJCepeda@gmail.com> ALJCepeda <AlfredJCepeda@gmail.com>
+Allen Yonghuang Wang <helloshuangzi@gmail.com>
 Amery <amery@xiangfa.org> 子丶言 <amery@xiangfa.org>
+Amit Bendor <ajbendor@gmail.com>
 Andreas Offenhaeuser <offenhaeuser@gmail.com> anoff <offenhaeuser@gmail.com>
 Andy Bettisworth <andy.bettisworth@accreu.com>
 Angel Stoyanov <atstojanov@gmail.com> atstojanov <atstojanov@gmail.com>
@@ -69,10 +72,11 @@ Chew Choon Keat <choonkeat@gmail.com>
 Chris Andrews <cpandrews8@gmail.com> cpandrews8 <cpandrews8@gmail.com>
 Chris Johnson <chris.s.johnson4@gmail.com>
 Chris Young <chris.young@tinder.com> <chris.young@gotinder.com>
-Claudio Rodriguez <cjrodr@yahoo.com> <cr@fansworld.tv>
-Colin Ihrig <cjihrig@gmail.com>
 Christophe Naud-Dulude <christophe.naud.dulude@gmail.com> Chris911 <christophe.naud.dulude@gmail.com>
 Christopher Lenz <cmlenz@gmail.com> <chris@lamech.local>
+Claudio Rodriguez <cjrodr@yahoo.com> <cr@fansworld.tv>
+Colin Ihrig <cjihrig@gmail.com>
+Corey Martin <coreymartin496@gmail.com>
 Damien Simonin Feugas <damien.feugas@gmail.com>
 Dan Kaplun <dbkaplun@gmail.com> <dan@beardtree.com>
 Dan Williams <dan@igniter.com> Dan.Williams <daniel@chat.za.net>
@@ -94,6 +98,7 @@ David Mark Clements <david.clements@nearform.com> davidmarkclements <david.cleme
 David Mark Clements <david.clements@nearform.com> davidmarkclements <huperekchuno@googlemail.com>
 David Siegel <david@artcom.de> <david.siegel@artcom.de>
 DC <dcposch@dcpos.ch> dcposch@dcpos.ch <dcposch@dcpos.ch>
+Deepjyoti Mondal <djmdeveloper060796@gmail.com>
 Domenic Denicola <domenic@domenicdenicola.com>
 Domenic Denicola <domenic@domenicdenicola.com> <d@domenic.me>
 Doug Wade <doug@dougwade.io> doug.wade <doug.wade@redfin.com>
@@ -101,6 +106,7 @@ Eduard Burtescu <eddy_me08@yahoo.com>
 Einar Otto Stangvik <einaros@gmail.com>
 Elliott Cable <me@ell.io>
 Eric Phetteplace <phette23@gmail.com>
+Ernesto Salazar <ernestoalbertosalazar@gmail.com>
 Erwin W. Ramadhan <erwinwahyuramadhan@gmail.com> erwinwahyura <erwinwahyuramadhan@gmail.com>
 Eugene Obrezkov <ghaiklor@gmail.com> ghaiklor <ghaiklor@gmail.com>
 EungJun Yi <semtlenori@gmail.com>
@@ -226,6 +232,7 @@ Marcin Zielinski <marzelin@gmail.com> marzelin <marzelin@gmail.com>
 Marti Martz <thalamew@q.com>
 Martial James Jefferson <martial.jefferson@gmail.com>
 Martijn Schrage <martijn@oblomov.com> Oblosys <martijn@oblomov.com>
+Masato Ohba <over.rye@gmail.com>
 Matheus Marchini <matheusdot@gmail.com> <matheus@sthima.com.br>
 Matheus Marchini <matheusdot@gmail.com> <matheus@sthima.com>
 Matt Lang <matt@mediasuite.co.nz> matt-in-a-hat <matt@mediasuite.co.nz>
@@ -253,6 +260,7 @@ Miroslav Bajtoš <miroslav@strongloop.com> <miro.bajtos@gmail.com>
 Mitar Milutinovic <mitar.git@tnode.com>
 Myles Borins <myles.borins@gmail.com> <mborins@us.ibm.com>
 Myles Borins <myles.borins@gmail.com> <mylesborins@google.com>
+Nam Nguyen <nam.nguyen@de.ibm.com>
 Nebu Pookins<nebu@nebupookins.net>
 Netto Farah <nettofarah@gmail.com> nettofarah <nettofarah@gmail.com>
 Nicholas Kinsey <pyrotechnick@feistystudios.com>
@@ -298,6 +306,7 @@ Ryan Mahan <ryanmahan97@gmail.com>
 Ryan Scheel <ryan.havvy@gmail.com> Ryan Scheel <Ryan.havvy@gmail.com>
 Ryan Scheel <ryan.havvy@gmail.com> Ryan Scheel (Havvy) <ryan.havvy@gmail.com>
 Saad Quadri <saad@saadq.com> saadq <saad@saadquadri.com>
+Sagir Khan <sagir.khan@gmail.com>
 Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
 Sam Mikes <smikes@cubane.com>
 Sam P Gallagher-Bishop <samgallagherb@gmail.com> <SPGB@users.noreply.github.com>
@@ -316,6 +325,7 @@ Shannen Saez <shannenlaptop@gmail.com>
 Shaopeng Zhang <szhang351@bloomberg.net> szhang351 <szhang351@bloomberg.net>
 Shigeki Ohtsu <ohtsu@ohtsu.org> <ohtsu@iij.ad.jp>
 Shigeki Ohtsu <ohtsu@ohtsu.org> <ohtsu@d.jp>
+Shivang Saxena <shivangs44@gmail.com>
 Shiya Luo <luo.shiya@gmail.com> shiya <luo.shiya@gmail.com>
 Siddharth Mahendraker <siddharth_mahen@hotmail.com> <siddharth_mahen@me.com>
 Simon Willison <simon@simonwillison.net>
@@ -343,6 +353,7 @@ Taylor Woll <taylor.woll@microsoft.com> taylor.woll <tawoll@ntdev.microsoft.com>
 Thomas Watson Steen <w@tson.dk> Thomas Watson <w@tson.dk>
 Timothy O. Peters <timotewpeters@gmail.com>
 Timur Shemsedinov <timur.shemsedinov@gmail.com> tshemsedinov <timur.shemsedinov@gmail.com>
+Ting Shao <ting.shao@intel.com>
 Toby Farley <tobyfarley@gmail.com> tobyfarley <tobyfarley@gmail.com>
 Toby Stableford <tobytronics@gmail.com> toboid <toboid@users.noreply.github.com>
 Todd Kennedy <todd@selfassembled.org> <toddself@users.noreply.github.com>
@@ -378,7 +389,8 @@ Vincent Voyer <v@fasterize.com>
 Vladimir de Turckheim <vlad2t@hotmail.com>
 vsemozhetbyt <vsemozhetbyt@gmail.com> Vse Mozhet Byt <vsemozhetbyt@gmail.com>
 Wang Xinyong <wang.xy.chn@gmail.com> <wangxy.chn@gmail.com>
-Weijia Wang <381152119@qq.com> starkwang <381152119@qq.com>
+Weijia Wang <381152119@qq.com>
+Weijia Wang <381152119@qq.com> starkewang <starkewang@tencent.com>
 Wei-Wei Wu <wuxx1045@umn.edu>
 Willi Eggeling <email@wje-online.de>
 Will Hayslett <william.hayslettjr@gmail.com>
@@ -390,6 +402,7 @@ Yazhong Liu <yorkiefixer@gmail.com> Yazhong Liu <l900422@vip.qq.com>
 Yazhong Liu <yorkiefixer@gmail.com> Yorkie <l900422@vip.qq.com>
 Yazhong Liu <yorkiefixer@gmail.com> Yorkie <yorkiefixer@gmail.com>
 Yazhong Liu <yorkiefixer@gmail.com> Yorkie Liu <yorkiefixer@gmail.com>
+Yingchen Xue <yingchenxue@qq.com>
 Yoshihiro KIKUCHI <yknetg@gmail.com>
 Yosuke Furukawa <yosuke.furukawa@gmail.com> <furukawa.yosuke@dena.jp>
 Yuichiro MASUI <masui@masuidrive.jp>
diff --git a/AUTHORS b/AUTHORS
index 3a156cbd2cb..db2e74f2508 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -2197,5 +2197,44 @@ TSUYUSATO Kitsune <make.just.on@gmail.com>
 daGo <daniel1kdago@gmail.com>
 Lambdac0re <Lambdac0re@users.noreply.github.com>
 Yulong Wang <f.s@qq.com>
+David Goldstein <dgoldstein@dropbox.com>
+Francesco Falanga <f.falanga@palmabit.com>
+Maya Lekova <apokalyptra@gmail.com>
+RakshithNM <rakshith_bellare@outlook.com>
+David Humphrey <david.humphrey@senecacollege.ca>
+Ting Shao <ting.shao@intel.com>
+Alex Fernández <alex.fernandez@logtrust.com>
+Yingchen Xue <yingchenxue@qq.com>
+Dan Kang <dann.kang@gmail.com>
+Masato Ohba <over.rye@gmail.com>
+я котик пур-пур <mvasilkov@gmail.com>
+Corey Martin <coreymartin496@gmail.com>
+chainhelen <chainhelen@gmail.com>
+Tim Seckinger <seckinger.tim@gmail.com>
+Nam Nguyen <nam.nguyen@de.ibm.com>
+Nicholas Dangles <nicholasdangles@gmail.com>
+Amit Bendor <ajbendor@gmail.com>
+Abhimanyu Vashisht <abhimanyuvashisht.av@gmail.com>
+Sagir Khan <sagir.khan@gmail.com>
+Kael Zhang <i+github@kael.me>
+Unknown <bdistin@gmail.com>
+Blaine Bublitz <blaine.bublitz@gmail.com>
+Shailesh Shekhawat <sshekhawat356@gmail.com>
+Davis Okoth <davisokoth@gmail.com>
+Shivang Saxena <shivangs44@gmail.com>
+Lucas Liepert <lucasdliepert@gmail.com>
+Miklos Suveges <miklos.suveges@gmail.com>
+Ernesto Salazar <ernestoalbertosalazar@gmail.com>
+Tommaso Allevi <tomallevi@gmail.com>
+Evandro Oliveira <evandrofranco@gmail.com>
+Kenny Yuan <kaining.yuan@intel.com>
+Hristijan Gjorgjievski <hristijan_kiko123@hotmail.com>
+Aliaksei Tuzik <aliaksei.tuzik@gmail.com>
+Misty De Meo <mistydemeo@gmail.com>
+James Kylstra <kylstraj@oregonstate.edu>
+Shelley Vohr <shelley.vohr@gmail.com>
+Deepjyoti Mondal <djmdeveloper060796@gmail.com>
+Brett Kiefer <brett@trello.com>
+Kevin Thomas <kevintab95@gmail.com>
 
 # Generated by tools/update-authors.sh