diff --git a/.authors.yml b/.authors.yml
index 25afaf17c..157cfee88 100644
--- a/.authors.yml
+++ b/.authors.yml
@@ -68,7 +68,7 @@
   github: gforsyth
 - name: Morten Enemark Lund
   email: melund@gmail.com
-  num_commits: 495
+  num_commits: 519
   first_commit: 2015-07-10 07:54:10
   github: melund
 - name: Ned Letcher
@@ -384,7 +384,7 @@
   email: lalochcz@gmail.com
   aliases:
   - laloch
-  num_commits: 101
+  num_commits: 124
   first_commit: 2018-07-26 13:51:50
   github: laloch
 - name: Nico Lehmann
@@ -434,7 +434,7 @@
   github: funkyfuture
 - name: Anthony Scopatz
   email: scopatz@gmail.com
-  num_commits: 2602
+  num_commits: 2623
   first_commit: 2015-01-21 17:04:13
   github: scopatz
 - name: anatoly techtonik
@@ -656,7 +656,7 @@
   - git@raphael.dasgupta.ch
   aliases:
   - Raphael Borun Das Gupta
-  num_commits: 10
+  num_commits: 12
   first_commit: 2017-01-03 06:56:44
 - name: Andrei
   email: fizicars@gmail.com
@@ -954,7 +954,7 @@
   github: selepo
 - name: Bob Hyman
   email: bob.hyman@bobssoftwareworks.com
-  num_commits: 103
+  num_commits: 118
   first_commit: 2016-06-26 16:48:47
   github: bobhy
   alternate_emails:
@@ -1020,7 +1020,7 @@
   first_commit: 2018-09-16 22:50:24
 - name: Gyuri Horak
   email: dyuri@horak.hu
-  num_commits: 8
+  num_commits: 11
   first_commit: 2019-06-18 12:00:16
   github: dyuri
 - name: Ke Zhang
@@ -1103,7 +1103,7 @@
   email: anki-code@users.noreply.github.com
   alternate_emails:
   - anki-code
-  num_commits: 31
+  num_commits: 35
   first_commit: 2019-10-15 18:20:58
   github: xxh
 - name: Sylvain Corlay
diff --git a/.mailmap b/.mailmap
index a4f164039..eb9332192 100644
--- a/.mailmap
+++ b/.mailmap
@@ -21,8 +21,8 @@ Jamie Bliss <astronouth7303@gmail.com> James Bliss <jamie.bliss@ilq.com>
 Jamie Bliss <astronouth7303@gmail.com> James Bliss <jbliss@nextgenerationenrollment.com>
 Jamie Bliss <astronouth7303@gmail.com> James Bliss <jamie@ivyleav.es>
 Hugo Wang <w@mitnk.com>
-Bob Hyman <bob.hyman@bobssoftwareworks.com> Bob Hyman <bob.hyman@gmail.com>
 David Strobach <lalochcz@gmail.com> laloch <lalochcz@gmail.com>
+Bob Hyman <bob.hyman@bobssoftwareworks.com> Bob Hyman <bob.hyman@gmail.com>
 BlahGeek <i@BlahGeek.com>
 Jean-Benoist Leger <jb@leger.tf> Jean-Benoist Leger <jbleger@gertrude>
 Jean-Benoist Leger <jb@leger.tf> Jean-Benoist Leger <jbleger@hds.utc.fr>
@@ -34,8 +34,8 @@ Matthias Bussonnier <bussonniermatthias@gmail.com>
 Aaron Griffin <aig787@gmail.com>
 Rob Brewer <rwb123@gmail.com> Robert W. Brewer <rwb123@gmail.com>
 virus <virusbb001a@gmail.com>
-Sagar Tewari <sagartewari01@gmail.com> Sagar Tewari <sagartewariym@yahoo.com>
 anki-code <anki-code@users.noreply.github.com> anki-code <anki-code>
+Sagar Tewari <sagartewari01@gmail.com> Sagar Tewari <sagartewariym@yahoo.com>
 Konstantin Molchanov <kmolchanov@machinezone.com> Konstantin Molchanov <moigagoo@live.com>
 Guillaume Leclerc <guillaume.leclerc@epfl.ch> Guillaume Leclerc <guillaume.leclerc.work@gmail.com>
 Gordon Ball <gordon@chronitis.net>
@@ -59,18 +59,18 @@ Brian Visel <eode@eptitude.net>
 Andrew Hundt <ATHundt@gmail.com>
 Jonathan Slenders <jonathan@slenders.be>
 Justin Moen <jamoen7@gmail.com>
+Raphael Das Gupta <raphael.das.gupta@hsr.ch> Raphael Borun Das Gupta <git@raphael.dasgupta.ch>
 Caleb Hattingh <caleb.hattingh@gmail.com>
 Daniel Shimon <daniel.shimon22@gmail.com>
 Jason R. Coombs <jaraco@jaraco.com>
+Gyuri Horak <dyuri@horak.hu>
 Stephan Fitzpatrick <knowsuchagency@gmail.com>
-Raphael Das Gupta <raphael.das.gupta@hsr.ch> Raphael Das Gupta <git@raphael.dasgupta.ch>
 K.-Michael Aye <kmichael.aye@gmail.com> K.-Michael Aye <michaelaye@users.noreply.github.com>
 halloleo <git@halloleo.dot.hailmail.dot.net> halloleo <halloleo@users.noreply.github.com>
 Will Wykeham <will@wykeham.net>
 Oleh Prypin <oleh@pryp.in>
 Brian Skinn <brian.skinn@gmail.com>
 Will S <wsha.code@gmail.com>
-Gyuri Horak <dyuri@horak.hu>
 Alessio Bogon <youtux@gmail.com> Alessio Bogon <youtux@users.noreply.github.com>
 Yohei Tamura <tamuhey@gmail.com>
 Maximilian Köhl <mail@koehlma.de>
diff --git a/AUTHORS.rst b/AUTHORS.rst
index bc63bbb7e..88d915abd 100644
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -8,8 +8,8 @@ Authors are sorted by number of commits.
 * Konstantinos Tsakiltzidis
 * Jamie Bliss
 * Hugo Wang
-* Bob Hyman
 * David Strobach
+* Bob Hyman
 * BlahGeek
 * Jean-Benoist Leger
 * christopher
@@ -20,8 +20,8 @@ Authors are sorted by number of commits.
 * Aaron Griffin
 * Rob Brewer
 * virus
-* Sagar Tewari
 * anki-code
+* Sagar Tewari
 * Konstantin Molchanov
 * Guillaume Leclerc
 * Gordon Ball
@@ -43,18 +43,18 @@ Authors are sorted by number of commits.
 * Andrew Hundt
 * Jonathan Slenders
 * Justin Moen
+* Raphael Das Gupta
 * Caleb Hattingh
 * Daniel Shimon
 * Jason R. Coombs
+* Gyuri Horak
 * Stephan Fitzpatrick
-* Raphael Das Gupta
 * K.-Michael Aye
 * halloleo
 * Will Wykeham
 * Oleh Prypin
 * Brian Skinn
 * Will S
-* Gyuri Horak
 * Alessio Bogon
 * Yohei Tamura
 * Maximilian Köhl