Merge branch 'master' into intersphinx_cache_limit

.mailmap

@@ -28,6 +28,7 @@ Christian Clauss <[email protected]> <[email protected]>
 Daniel Eades <[email protected]>
 Daniel Eades <[email protected]> <[email protected]>
 Daniel Eades <[email protected]> <[email protected]>
+Daniel Eades <[email protected]> <[email protected]>
 
 # Daniel Hahler (https://github.com/blueyed)
 Daniel Hahler <[email protected]> <[email protected]>
@@ -37,6 +38,9 @@ Daniel Neuhäuser <[email protected]> <[email protected]>
 
 David Ham <[email protected]> <David,[email protected]>
 
+# Dimitri Papadopoulos Orfanos (https://github.com/DimitriPapadopoulos)
+Dimitri Papadopoulos Orfanos <[email protected]>
+
 # Dmitry Shachnev (https://github.com/mitya57)
 Dmitry Shachnev <[email protected]> <[email protected]>
 
@@ -55,10 +59,15 @@ Eric Knibbe <[email protected]> <[email protected]>
 
 # Hugo van Kemenade (https://github.com/hugovk)
 Hugo van Kemenade <[email protected]>
-
+Hugo van Kemenade <[email protected]> <[email protected]>
 # Ignacio Fdez. Galván (https://github.com/Jellby)
 Ignacio Fdez. Galván <[email protected]>
 
+# Jacob Mason (https://github.com/jacobmason)
+Jacob Mason <[email protected]>
+Jacob Mason <[email protected]> <jacob@panda>
+Jacob Mason <[email protected]> <jacob@panther>
+
 # Jakob Lykke Andersen (https://github.com/jakobandersen)
 Jakob Lykke Andersen <[email protected]> <[email protected]>
 Jakob Lykke Andersen <[email protected]> <[email protected]>
@@ -68,9 +77,9 @@ Jakub Wilk <[email protected]> <[email protected]>
 James Hilton-Balfe <[email protected]> <[email protected]>
 
 # Jean-François B. (https://github.com/jfbu)
-Jean-François B. <jfbu@free.fr>
-Jean-François B. <jfbu@free.fr> <[email protected].com>
-Jean-François B. <jfbu@free.fr> <[email protected]>
+Jean-François B. <jfbu@users.noreply.github.com>
+Jean-François B. <jfbu@users.noreply.github.com> <[email protected]>
+Jean-François B. <jfbu@users.noreply.github.com> <[email protected]>
 
 Jean Abou-Samra <[email protected]>
 
@@ -87,6 +96,9 @@ Justin Mathews <[email protected]> <[email protected]>
 # Justus Magin (https://github.com/keewis)
 Justus Magin <[email protected]>
 
+# KINEBUCHI Tomohiko (https://github.com/cocoatomo)
+KINEBUCHI Tomohiko <[email protected]>
+
 Latosha Maltba <[email protected]>
 
 # Louis Maddox (https://github.com/lmmx)