diff --git a/.authors.yml b/.authors.yml
index ed1acdb9c..3054fb3eb 100644
--- a/.authors.yml
+++ b/.authors.yml
@@ -62,7 +62,7 @@
   github: gforsyth
 - name: Morten Enemark Lund
   email: melund@gmail.com
-  num_commits: 460
+  num_commits: 464
   first_commit: 2015-07-10 07:54:10
   github: melund
 - name: Ned Letcher
@@ -378,7 +378,7 @@
   email: lalochcz@gmail.com
   aliases:
   - laloch
-  num_commits: 34
+  num_commits: 41
   first_commit: 2018-07-26 13:51:50
   github: laloch
 - name: Nico Lehmann
@@ -395,7 +395,7 @@
   alternate_emails:
   - jbleger@gertrude
   - jbleger@hds.utc.fr
-  num_commits: 43
+  num_commits: 49
   first_commit: 2017-01-01 19:27:34
 - name: Nigel Tea
   email: nigelbtea@gmail.com
@@ -428,7 +428,7 @@
   github: funkyfuture
 - name: Anthony Scopatz
   email: scopatz@gmail.com
-  num_commits: 2452
+  num_commits: 2457
   first_commit: 2015-01-21 17:04:13
   github: scopatz
 - name: anatoly techtonik
@@ -959,7 +959,7 @@
   github: ntdef
 - name: virus
   email: virusbb001a@gmail.com
-  num_commits: 16
+  num_commits: 18
   first_commit: 2019-03-06 10:36:26
   github: virusbb001
 - name: Steven Kryskalla
@@ -978,7 +978,7 @@
   github: rodrigogolive
 - name: Carmen Bianca Bakker
   email: carmen@carmenbianca.eu
-  num_commits: 7
+  num_commits: 13
   first_commit: 2019-04-07 16:33:01
   github: carmenbianca
 - name: Andrés García García
@@ -988,3 +988,17 @@
   num_commits: 4
   github: Ad115
   first_commit: 2019-05-06 14:17:57
+- name: con-f-use
+  email: con-f-use@users.noreply.github.com
+  num_commits: 2
+  first_commit: 2019-05-15 04:53:37
+- name: cclauss
+  email: cclauss@me.com
+  num_commits: 2
+  first_commit: 2019-05-02 07:35:11
+  github: cclauss
+- name: Eddie Peters
+  email: edward.paul.peters@gmail.com
+  num_commits: 2
+  first_commit: 2019-05-10 06:18:40
+  github: eppeters
diff --git a/.mailmap b/.mailmap
index da0f6afd9..34e1a2d82 100644
--- a/.mailmap
+++ b/.mailmap
@@ -20,16 +20,16 @@ Jamie Bliss <astronouth7303@gmail.com> James Bliss <jamie.bliss@ilq.com>
 Jamie Bliss <astronouth7303@gmail.com> James Bliss <jbliss@nextgenerationenrollment.com>
 Hugo Wang <w@mitnk.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>
 Klaus Alexander Seistrup <klaus@seistrup.dk> Klaus Alexander Seistrup <kseistrup@users.noreply.github.com>
 Leonardo Santagada <santagada@gmail.com>
 Bob Hyman <bob.hyman@bobssoftwareworks.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>
+David Strobach <lalochcz@gmail.com> laloch <lalochcz@gmail.com>
 christopher <cjwright4242@gmail.com>
 Aaron Griffin <aig787@gmail.com>
 Rob Brewer <rwb123@gmail.com> Robert W. Brewer <rwb123@gmail.com>
 Burak Yiğit Kaya <ben@byk.im> Burak Yigit Kaya <ben@byk.im>
-David Strobach <lalochcz@gmail.com> laloch <lalochcz@gmail.com>
 Sagar Tewari <sagartewari01@gmail.com> Sagar Tewari <sagartewariym@yahoo.com>
 Matthias Bussonnier <bussonniermatthias@gmail.com>
 Konstantin Molchanov <kmolchanov@machinezone.com> Konstantin Molchanov <moigagoo@live.com>
@@ -48,6 +48,7 @@ Frank Sachsenheim <funkyfuture@riseup.net> Frank Sachsenheim <funkyfuture@users.
 Kurtis Rader <krader@skepticism.us>
 cryzed <cryzed@googlemail.com>
 Brian Visel <eode@eptitude.net>
+Carmen Bianca Bakker <carmen@carmenbianca.eu>
 Andrew Hundt <ATHundt@gmail.com>
 Jonathan Slenders <jonathan@slenders.be>
 Justin Moen <jamoen7@gmail.com>
@@ -63,7 +64,6 @@ vaaaaanquish <6syun9@gmail.com> @vaaaaanquish <6syun9@gmail.com>
 Alessio Bogon <youtux@gmail.com> Alessio Bogon <youtux@users.noreply.github.com>
 Yohei Tamura <tamuhey@gmail.com>
 Maximilian Köhl <mail@koehlma.de>
-Carmen Bianca Bakker <carmen@carmenbianca.eu>
 Cody Scott <cody.j.b.scott@gmail.com>
 Jake Hedman <jake@hedman.email>
 Alexander Sosedkin <monk@unboiled.info>
@@ -147,6 +147,9 @@ Emre Ates <ates@bu.edu>
 Romain Bignon <romain@symlink.me>
 Owen Campbell <owen.campbell@tanti.org.uk>
 Steven Kryskalla <skryskalla@gmail.com>
+con-f-use <con-f-use@users.noreply.github.com>
+cclauss <cclauss@me.com>
+Eddie Peters <edward.paul.peters@gmail.com>
 Dan Allan <dallan@bnl.gov>
 adam j hartz <adam@smatz.net>
 Ned Letcher <nletcher@gmail.com>
diff --git a/AUTHORS.rst b/AUTHORS.rst
index 4733186f9..8bdefb82c 100644
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -9,15 +9,15 @@ Authors are sorted by number of commits.
 * Jamie Bliss
 * Hugo Wang
 * BlahGeek
+* Jean-Benoist Leger
 * Klaus Alexander Seistrup
 * Leonardo Santagada
 * Bob Hyman
-* Jean-Benoist Leger
+* David Strobach
 * christopher
 * Aaron Griffin
 * Rob Brewer
 * Burak Yiğit Kaya
-* David Strobach
 * Sagar Tewari
 * Matthias Bussonnier
 * Konstantin Molchanov
@@ -36,6 +36,7 @@ Authors are sorted by number of commits.
 * Kurtis Rader
 * cryzed
 * Brian Visel
+* Carmen Bianca Bakker
 * Andrew Hundt
 * Jonathan Slenders
 * Justin Moen
@@ -51,7 +52,6 @@ Authors are sorted by number of commits.
 * Alessio Bogon
 * Yohei Tamura
 * Maximilian Köhl
-* Carmen Bianca Bakker
 * Cody Scott
 * Jake Hedman
 * Alexander Sosedkin
@@ -135,6 +135,9 @@ Authors are sorted by number of commits.
 * Romain Bignon
 * Owen Campbell
 * Steven Kryskalla
+* con-f-use
+* cclauss
+* Eddie Peters
 * Dan Allan
 * adam j hartz
 * Ned Letcher