Merge pull request #2706 from nipy/rel/1.1.3

REL: 1.1.3

Author: effigies

.mailmap

@@ -1,20 +1,23 @@
 Aimi Watanabe <watanabe.aimi@gmail.com> stymy <rschadmin@cmi-rsch-li002.childmind.org>
 Aimi Watanabe <watanabe.aimi@gmail.com> stymy <watanabe.aimi@gmail.com>
+Alejandro Tabas <alextabas@gmail.com> qTabs <qtabas@gmail.com>
+Alejandro Tabas <alextabas@gmail.com> qtabs <alextabas@gmail.com>
 Alejandro de la Vega <aleph4@gmail.com> adelavega <delavega@utexas.edu>
 Alexander Schaefer <alexschaefer83@gmail.com> Alexander Schaefer <aschaefer@melisse.cbs.mpg.de>
 Alexander Schaefer <alexschaefer83@gmail.com> alexschaefer83 <alexschaefer83@gmail.com>
 Alexander Schaefer <alexschaefer83@gmail.com> aschaefer <aschaefer@aschaefer-U36SD.(none)>
 Alexandre M. Savio <alexsavio@gmail.com> Alexandre M. S <alexsavio@gmail.com>
 Alexandre M. Savio <alexsavio@gmail.com> Alexandre M. S <alexsavio@users.noreply.github.com>
 Alexandre M. Savio <alexsavio@gmail.com> Alexandre Manhaes Savio <alexsavio@gmail.com>
+Andrey Chetverikov <stop.psy@gmail.com> Andrey Chetverikov <achetverikov@users.noreply.github.com>
+Andrey Chetverikov <stop.psy@gmail.com> achetverikov <stop.psy@gmail.com>
 Anisha Keshavan <akeshavan@gmail.com> Anisha Keshavan <akeshavan@ucla.edu>
 Anisha Keshavan <akeshavan@gmail.com> akeshavan <keshavan@berkeley.edu>
 Ariel Rokem <arokem@berkeley.edu> arokem <arokem@berkeley.edu>
 Ariel Rokem <arokem@berkeley.edu> arokem <arokem@gmail.com>
 Arman Eshaghi <arman.eshaghi@gmail.com> armaneshaghi <arman.eshaghi@gmail.com>
 Ashely Gillman <gillmanash@gmail.com> Ashley Gillman <ashley.gillman@csiro.au>
 Ashely Gillman <gillmanash@gmail.com> ashgillman <ashley.gillman@csiro.au>
-Andrey Chetverikov <stop.psy@gmail.com> achetverikov <stop.psy@gmail.com>
 Basille Pinsard <basile.pinsard@umontreal.ca> bpinsard <basile.pinsard@umontreal.ca>
 Basille Pinsard <basile.pinsard@umontreal.ca> bpinsard <bpinsard@imed.jussieu.fr>
 Ben Cipollini <bcipollini@classy.org> Ben Cipollini <bcipolli@ucsd.edu>
@@ -24,6 +27,7 @@ Blake Dewey <blake.dewey@jhu.edu> Blake Dewey <blake.dewey@nih.gov>
 Blake Dewey <blake.dewey@jhu.edu> blakedewey <deweybe@ndsl-nib-bdewey.local>
 Blake Dewey <blake.dewey@jhu.edu> blakedewey <deweybe@ndsl-nib-bdewey.ninds.nih.gov>
 Brendan Moloney <moloney.brendan@gmail.com> moloney <moloney.brendan@gmail.com>
+Caroline Froehlich <carol.frohlich@gmail.com> carolFrohlich <carol.frohlich@gmail.com>
 Chris Filo Gorgolewski <chris.gorgolewski@gmail.com> Chris Filo Gorgolewski <filo@filo-Precision-M6500.(none)>
 Chris Filo Gorgolewski <chris.gorgolewski@gmail.com> Chris Filo Gorgolewski <krzysztof.gorgolewski+fake@gmail.com>
 Chris Filo Gorgolewski <chris.gorgolewski@gmail.com> Chris Filo Gorgolewski <krzysztof.gorgolewski@gmail.com>
@@ -40,21 +44,28 @@ Cindee Madison <cindee@berkeley.edu> cindeem
 Cindee Madison <cindee@berkeley.edu> cindeem <>
 Colin Buchanan <colinrbuchanan@gmail.com> Colin Buchanan <cbuchanan@cray4.(none)>
 Colin Buchanan <colinrbuchanan@gmail.com> colinbuchanan <colinrbuchanan@gmail.com>
+Daniel Brenner <daniel.brenner@me.com> brennerd <daniel.brenner@me.com>
+Daniel Brenner <daniel.brenner@me.com> brennerd11 <daniel.brenner@me.com>
 Daniel Clark <danieljclark87@gmail.com> dclark87 <danieljclark87@gmail.com>
+Daniel Geisler <daniel.geisler@gmail.com> daniel-ge <daniel.geisler@gmail.com>
 Daniel Ginsburg <daniel.ginsburg@childrens.harvard.edu> danginsburg <daniel.ginsburg@childrens.harvard.edu>
 Daniel McNamee <dmcx88@gmail.com> danmc <dmcx88@gmail.com>
 David Ellis <dgellis90@gmail.com> David Ellis <david-ellis@uiowa.edu>
 David Ellis <dgellis90@gmail.com> David Ellis <david.ellis@unmc.edu>
 David Welch <david.m.welch@gmail.com> David Welch <dmwelch@users.noreply.github.com>
+Dimitri Papadopoulos Orfanos <dimitri.papadopoulos@cea.fr> Dimitri Papadopoulos <dimitri.papadopoulos@cea.fr>
 Dmytro <belevtsoff@gmail.com> belevtsoff <belevtsoff@gmail.com>
+Dylan Nielson <adenosine@gmail.com> Dylan <Dylan.Nielson@nih.gov>
+Elizabeth DuPre <emd222@cornell.edu> emdupre <emd222@cornell.edu>
 Erik Ziegler <erik.sweed@gmail.com> Erik <erik.ziegler@ulg.ac.be>
 Erik Ziegler <erik.sweed@gmail.com> Erik Ziegler <erik.ziegler@ulg.ac.be>
 Erik Ziegler <erik.sweed@gmail.com> erik <erik@erik-ubuntu.(none)>
 Erik Ziegler <erik.sweed@gmail.com> erikz <erik.ziegler@ulg.ac.be>
 Erik Ziegler <erik.sweed@gmail.com> swederik <erik.sweed@gmail.com>
 Fernando Pérez-García <fepegar@gmail.com> Fernando <fepegar@gmail.com>
-Franz Liem <franz.liem@gmail.com> fliem <franz.liem@gmail.com>
 Franz Liem <franz.liem@gmail.com> fliem <franz.liem>
+Franz Liem <franz.liem@gmail.com> fliem <franz.liem@gmail.com>
+Fred Loney <loneyf@ohsu.edu> FredLoney <loneyf@ohsu.edu>
 Gael Varoquaux <gael.varoquaux@normalesup.org> GaelVaroquaux
 Gael Varoquaux <gael.varoquaux@normalesup.org> GaelVaroquaux <gael.varoquaux@noramlesup.org>
 Gavin Cooper <Gavin.Cooper@newcastle.edu.au> gjcooper <gjcooper@gmail.com>
@@ -63,40 +74,70 @@ Hans Johnson <hans-johnson@uiowa.edu> Hans Johnson <hans.j.johnson@gmail.com>
 Hans Johnson <hans-johnson@uiowa.edu> hjmjohnson <hans.j.johnson@gmail.com>
 Horea Christian <horea.christ@yandex.com> Horea Christian <h.chr@mail.ru>
 Isaac Schwabacher <ischwabacher@wisc.edu> ischwabacher <ischwabacher@wisc.edu>
-James Kent <james-kent@uiowa.edu> jdkent <james-kent@uiowa.edu>
+Jakub Kaczmarzyk <jakubk@mit.edu> jakubk <jakubk@mit.edu>
 Jakub Kaczmarzyk <jakubk@mit.edu> kaczmarj <jakubk@mit.edu>
+James Kent <james-kent@uiowa.edu> jdkent <james-kent@uiowa.edu>
+Janosch Linkersdörfer <linkersdoerfer@gmail.com> Januzz <linkersdoerfer@gmail.com>
 Jason Wong <jf126dolphin@gmail.com> Jason <jf126dolphin@gmail.com>
-Jason Wong <jf126dolphin@gmail.com> jason <jf126dolphin@gmail.com>
-Jason Wong <jf126dolphin@gmail.com> Jason W <jf126dolphin@gmail.com>
 Jason Wong <jf126dolphin@gmail.com> Jason W <jasonwong73@ucla.edu>
+Jason Wong <jf126dolphin@gmail.com> Jason W <jf126dolphin@gmail.com>
+Jason Wong <jf126dolphin@gmail.com> jason <jf126dolphin@gmail.com>
 Jason Wong <jf126dolphin@gmail.com> jason-wg <jf126dolphin@gmail.com>
 Jens Kleesiek <kleesiek@uni-heidelberg.de> JensNRAD <kleesiek@uni-heidelberg.de>
+Jessica Forbes <jessica-forbes@uiowa.edu> jessicaforbes <jessica-forbes@uiowa.edu>
+Jérémy Guillon <jeremy.guillon@inria.fr> GUILLON Jeremy <jeremy.guillon@etu.upmc.fr>
 Joerg Stadler <Joerg.Stadler@lin-magdeburg.de> Joerg Stadler <joerg.stadler@lin-magdeburg.de>
 Joerg Stadler <Joerg.Stadler@lin-magdeburg.de> Jörg Stadler <Stadler@lin-magdeburg.de>
 Joke Durnez <joke.durnez@gmail.com> jokedurnez <joke.durnez@gmail.com>
+Josh Warner <silvertrumpet999+github@gmail.com> JDWarner <warner.joshua@mayo.edu>
 Josh Warner <silvertrumpet999+github@gmail.com> Josh Warner (Mac) <warner.joshua@mayo.edu>
 Kai Schlamp <schlamp@gmx.de> medihack <schlamp@gmx.de>Jessica Forbes <jessica-forbes@uiowa.edu> jessicaforbes <jessica-forbes@uiowa.edu>
+Katie Bottenhorn <kbott006@fiu.edu> 62442katieb <kbott006@fiu.edu>
+Kesshi Jordan <Kesshi.Jordan@ucsf.edu> Kesshi Jordan <Kesshi.Jordan@ucsf.edu> 
+Kesshi Jordan <Kesshi.Jordan@ucsf.edu> Kesshi Jordan <kesshi.jordan@gmail.com>
+Kesshi Jordan <Kesshi.Jordan@ucsf.edu> Kesshi Jordan <kesshijordan@D-108-179-130-38.dhcp4.washington.edu>
+Kesshi Jordan <Kesshi.Jordan@ucsf.edu> Kesshi Jordan <kesshijordan@D-69-91-152-99.dhcp4.washington.edu>
+Kesshi Jordan <Kesshi.Jordan@ucsf.edu> Kesshi Jordan <kesshijordan@iPhone-010060104098.ucsf.edu>
+Kesshi Jordan <Kesshi.Jordan@ucsf.edu> Kesshi jordan <kjordan@codd.radiology.ucsf.edu>
+Kesshi Jordan <Kesshi.Jordan@ucsf.edu> kesshijordan <Kesshi.Jordan@ucsf.edu>
 Kevin Sitek <ksitek@mit.edu> sitek <ksitek@mit.edu>
+Kevin Sitek <ksitek@mit.edu> sitek <sitek.kevin@gmail.com>
 Leonie Lampe <leonie.lampe@gmail.com> Leonie Lmape <leonie.lampe@gmail.com>
 Lukas Snoek <lukassnoek@gmail.com> Lukas Snoek <lukassnoek@gmail.com>
+Marcel Falkiewicz <mfalkiewicz@gmail.com> Marcel Falkiewicz <m.falkiewicz@nencki.gov.pl>
+Mathias Goncalves <goncalves.mathias@gmail.com> Mathias Goncalves <mathiasg@mit.edu>
 Mathias Goncalves <goncalves.mathias@gmail.com> mathiasg <mathiasg@mit.edu>
+Mathieu Dubois <mathieu.dubois@icm-institute.org> Mathieu Dubois <mathieu.dubois@cea.fr>
+Mathieu Dubois <mathieu.dubois@icm-institute.org> duboism <duboismathieu_gaas@yahoo.fr>
 Matteo Mancini <ingmatteomancini@gmail.com> matteomancini <ingmatteomancini@gmail.com>
+Matteo Visconti dOC <matteo.visconti.gr@dartmouth.edu> Matteo Visconti dOC <mvdoc.gr@dartmouth.edu>
 Matteo Visconti dOC <matteo.visconti.gr@dartmouth.edu> mvdoc <matteo.visconti.gr@dartmouth.edu>
-Michael Dayan <mdayan.research@gmail.com> Michael <mdayan.research@gmail.com>
+Michael Clark <michael.clark195@gmail.com> Clark <clarkmg@nih.gov>
 Michael Dayan <mdayan.research@gmail.com> Michael <mdayan.comp@gmail.com>
+Michael Dayan <mdayan.research@gmail.com> Michael <mdayan.research@gmail.com>
 Michael Dayan <mdayan.research@gmail.com> mick-d <mid2021@CHUCK.(none)>
-Michael Clark <michael.clark195@gmail.com> Clark <clarkmg@nih.gov>
 Michael Notter <michaelnotter@hotmail.com> miykael <michaelnotter@hotmail.com>
 Michael Waskom <michael.l.waskom@gmail.com> Michael Waskom <mwaskom@mit.edu>
+Michael Waskom <michael.l.waskom@gmail.com> Michael Waskom <mwaskom@nyu.edu>
 Michael Waskom <michael.l.waskom@gmail.com> Michael Waskom <mwaskom@stanford.edu>
 Michael Waskom <michael.l.waskom@gmail.com> mwaskom <mwaskom@mit.edu>
-Michael Waskom <michael.l.waskom@gmail.com> mwaskom <mwaskom@stanford.edu>
 Michael Waskom <michael.l.waskom@gmail.com> mwaskom <mwaskom@nyu.edu>
+Michael Waskom <michael.l.waskom@gmail.com> mwaskom <mwaskom@stanford.edu>
+Oliver Contier <o.contier@gmail.com> oliver-contier <oliver.contier@ovgu.de>
 Oscar Esteban <code@oscaresteban.es> Oscar Esteban <code@oscaresteban>
 Oscar Esteban <code@oscaresteban.es> oesteban <code@oscaresteban.es>
+Pablo Polosecki <pipolose@us.ibm.com> pipolose <pipolose@pipoloses-MacBook-Air.local>
+Pablo Polosecki <pipolose@us.ibm.com> pipolose <pipolose@pipoloses-air.watson.ibm.com>
+Ranjit Khanuja <ranjit.jhu@gmail.com> RanjitK <ranjit.jhu@gmail.com>
+Ross Markello <rossmarkello@gmail.com> Ross Markello <rdm222@cornell.edu>
 Russell Poldrack <poldrack@gmail.com> Russ Poldrack <poldrack@gmail.com>
 Russell Poldrack <poldrack@gmail.com> poldrack <poldrack@gmail.com>
+Salma Bougacha <salmabougacha@hotmail.com> Salma BOUGACHA <salmabougacha@hotmail.com>
+Salma Bougacha <salmabougacha@hotmail.com> salma <salmabougacha@hotmail.com>
+Salma Bougacha <salmabougacha@hotmail.com> salma1601 <salmabougacha@hotmail.com>
 Satrajit Ghosh <satrajit.ghosh@gmail.com> Satrajit Ghosh <satra@mit.edu>
+Sebastian Urchs <sebastian.urchs@gmail.com> sebastian <sebastian.urchs@gmail.com>
+Sharad Sikka <ssikka25@gmail.com> ssikka <ssikka25@gmail.com>
 Shariq Iqbal <shariqiqbal2810@gmail.com> shariqiqbal2810 <shariqiqbal2810@gmail.com>
 Shariq Iqbal <shariqiqbal2810@gmail.com> shariqiqbal2810 <shariqiqbal2810@users.noreply.github.com>
 Shoshana Berleant <berleant@stanford.edu> Shoshana Berleant <nope>
@@ -111,5 +152,5 @@ Tristan Glatard <tristan.glatard@mcgill.ca> Tristan Glatard <tristan.glatard@cre
 Victor Saase <victor@saase.net> vsaase <victor@saase.net>
 William Triplett <wtriplett@gmail.com> William Triplett <wtriplett@ufl.edu>
 Wolfgang Pauli <Wolfgang.m.Pauli@gmail.com> Wolfgang Pauli <Wolfgang.m.Pauli@gmail.com>
+Xiangzhen Kong <bnucon@gmail.com> bnucon <bnucon@gmail.com>
 Yaroslav Halchenko <debian@onerussian.com> Yaroslav Halchenko <yoh@dartmouth.edu>
-pipolose <pipolose@pipoloses-air.watson.ibm.com> pipolose <pipolose@pipoloses-MacBook-Air.local>