diff --git a/.authors.yml b/.authors.yml
index 2d3154711..1db69fd1b 100644
--- a/.authors.yml
+++ b/.authors.yml
@@ -14,7 +14,7 @@
   alternate_emails:
   - ajelenak@users.noreply.github.com
   github: ajelenak
-  num_commits: 41
+  num_commits: 48
   first_commit: 2015-12-14 09:41:05
 - name: pharshalp
   email: pharshalp@gmail.com
@@ -50,7 +50,7 @@
   email: aragilar@gmail.com
   alternate_emails:
   - aragilar+github@gmail.com
-  num_commits: 154
+  num_commits: 161
   first_commit: 2014-12-10 23:30:56
   github: aragilar
 - name: Toon Verstraelen
@@ -224,7 +224,7 @@
   github: msabramo
 - name: Thomas A Caswell
   email: tcaswell@bnl.gov
-  num_commits: 171
+  num_commits: 173
   first_commit: 2016-08-06 20:10:45
   alternate_emails:
   - tcaswell@uchicago.edu
@@ -245,7 +245,7 @@
   alternate_emails:
   - rainwoodman@gmail.com
   - feyu@google.com
-  num_commits: 10
+  num_commits: 11
   first_commit: 2015-08-14 19:43:46
   github: rainwoodman
 - name: Axel Huebl
@@ -372,7 +372,7 @@
   alternate_emails:
   - thomas.kluyver@xfel.eu
   - takowl@gmail.com
-  num_commits: 576
+  num_commits: 613
   first_commit: 2018-06-23 08:47:27
   github: takluyver
 - name: Matt Zwier
@@ -775,7 +775,7 @@
   github: mattip
 - name: Cyril Danilevski
   email: cydanil@gmail.com
-  num_commits: 11
+  num_commits: 15
   first_commit: 2020-04-06 17:12:26
   github: cydanil
 - name: Philipp A
@@ -895,11 +895,16 @@
   aliases:
   - Tom Donoghue
   - Tom
-  num_commits: 1
+  num_commits: 4
   first_commit: 2021-03-15 16:31:00
   github: TomDonoghue
 - name: Samuel Dowling
   email: samuel.dowling@protonmail.com
-  num_commits: 1
+  num_commits: 6
   first_commit: 2021-05-11 10:15:56
   github: samuel-emrys
+- name: Michał Górny
+  email: mgorny@gentoo.org
+  num_commits: 1
+  first_commit: 2021-04-12 10:48:16
+  github: mgorny
diff --git a/.mailmap b/.mailmap
index 9cc468795..22d4ad0b4 100644
--- a/.mailmap
+++ b/.mailmap
@@ -18,9 +18,9 @@ James Tocknell <aragilar@gmail.com> James Tocknell <aragilar+github@gmail.com>
 Jerome Kieffer <jerome.kieffer@esrf.fr> Jerome Kieffer <github@terre-adelie.org>
 Chen <chenguopingdota@163.com> chenguoping <chenguopingdota@163.com>
 Chen <chenguopingdota@163.com> Chenguoping <chenguopingdota@163.com>
+Aleksandar Jelenak <ajelenak@hdfgroup.org> Aleksandar Jelenak <ajelenak@users.noreply.github.com>
 Андрей Парамонов <paramon@lims.acdlabs.ru>
 Darren Dale <dsdale24@gmail.com> ddale <darren@f2-analysis-2.chess.cornell.edu>
-Aleksandar Jelenak <ajelenak@hdfgroup.org> Aleksandar Jelenak <ajelenak@users.noreply.github.com>
 Henri Payno <henri.payno@esrf.fr> payno <payno@linazimov.esrf.fr>
 Henri Payno <henri.payno@esrf.fr> payno <payno@users.noreply.github.com>
 Henri Payno <henri.payno@esrf.fr> payno <henri.payno@gmail.com>
@@ -38,11 +38,11 @@ Aaron Parsons <aaron.parsons@diamond.ac.uk>
 Julia Garriga Ferrer <julia.garriga@esrf.fr> juliagarriga <juliiaa28@gmail.com>
 Jerome Kieffer <kieffer@esrf.fr> Jerome Kieffer <jerome.kieffer@terre-adelie.org>
 Hameer Abbasi <hameerabbasi@yahoo.com>
+Cyril Danilevski <cydanil@gmail.com>
 John Readey <jreadey@hdfgroup.org>
 Lawrence Chan <element103@gmail.com> Lawrence Chan <lchan@jumptrading.com>
 V. Armando Solé <sole@esrf.fr> V. Armando Solé <vasole@users.noreply.github.com>
 Andrey Paramonov <cmr.pent@gmail.com>
-Cyril Danilevski <cydanil@gmail.com>
 Yu Feng <yfeng1@waterfall.dyn.berkeley.edu> Yu Feng <rainwoodman@gmail.com>
 Yu Feng <yfeng1@waterfall.dyn.berkeley.edu> Yu Feng <feyu@google.com>
 Liu JiaLin <jaln.liu@ttu.edu> valiantljk <jaln.liu@ttu.edu>
@@ -58,6 +58,7 @@ Pierre de Buyl <pdebuyl@ulb.ac.be>
 miketrumpis <mtrumpis@gmail.com>
 Vladimir Brankov <vbrankov@janestreet.com>
 Bruce Merry <bmerry@ska.ac.za> Bruce Merry <1963944+bmerry@users.noreply.github.com>
+Samuel Dowling <samuel.dowling@protonmail.com>
 Florian Rathgeber <florian.rathgeber@gmail.com>
 Chris Billington <chrisjbillington@gmail.com>
 Max Dietz <maxwell.r.dietz@gmail.com>
@@ -77,6 +78,8 @@ Clemens Weninger <clemens.weninger@maxiv.lu.se> Clemens Weninger <clemens@m-info
 Robin De Schepper <robin.deschepper93@gmail.com>
 aporter <aporter@blueorigin.com>
 Kai Muehlbauer <kai.muehlbauer@uni-bonn.de>
+Thomas Donoghue <tdonoghue.research@gmail.com> Tom Donoghue <tdonoghue@ucsd.edu>
+Thomas Donoghue <tdonoghue.research@gmail.com> Tom <tdonoghue@ucsd.edu>
 Kit Choi <kit@kychoi.org>
 lucasb-eyer <lucasb.eyer.be@gmail.com>
 Matthew Brett <matthew.brett@gmail.com>
@@ -185,3 +188,4 @@ Luke Tudge <luketudge@gmail.com>
 Gang Chen <gang.chen@zenuity.com>
 patiencedaur <patiencedaur@gmail.com>
 Tim Gates <tim.gates@iress.com>
+Michał Górny <mgorny@gentoo.org>
diff --git a/AUTHORS b/AUTHORS
index b24cc41ae..8a848f2ed 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -7,9 +7,9 @@ Authors are sorted by number of commits.
 * James Tocknell
 * Jerome Kieffer
 * Chen
+* Aleksandar Jelenak
 * Андрей Парамонов
 * Darren Dale
-* Aleksandar Jelenak
 * Henri Payno
 * Thomas VINCENT
 * Pierlauro Sciarelli
@@ -24,11 +24,11 @@ Authors are sorted by number of commits.
 * Julia Garriga Ferrer
 * Jerome Kieffer
 * Hameer Abbasi
+* Cyril Danilevski
 * John Readey
 * Lawrence Chan
 * V. Armando Solé
 * Andrey Paramonov
-* Cyril Danilevski
 * Yu Feng
 * Liu JiaLin
 * lhole
@@ -43,6 +43,7 @@ Authors are sorted by number of commits.
 * miketrumpis
 * Vladimir Brankov
 * Bruce Merry
+* Samuel Dowling
 * Florian Rathgeber
 * Chris Billington
 * Max Dietz
@@ -62,6 +63,7 @@ Authors are sorted by number of commits.
 * Robin De Schepper
 * aporter
 * Kai Muehlbauer
+* Thomas Donoghue
 * Kit Choi
 * lucasb-eyer
 * Matthew Brett
@@ -167,3 +169,4 @@ Authors are sorted by number of commits.
 * Gang Chen
 * patiencedaur
 * Tim Gates
+* Michał Górny