Merge remote-tracking branch 'upstream/maint/1.4.x'

Author: effigies

.mailmap

@@ -16,6 +16,7 @@ Andrey Chetverikov <stop.psy@gmail.com> <achetverikov@users.noreply.github.com>
 Anibal Sólon Heinsfeld <anibalsolon@gmail.com>
 Anisha Keshavan <akeshavan@gmail.com> <akeshavan@ucla.edu>
 Anisha Keshavan <akeshavan@gmail.com> <keshavan@berkeley.edu>
+Anna Doll <45283972+AnnaD15@users.noreply.github.com>
 Ariel Rokem <arokem@berkeley.edu>
 Ariel Rokem <arokem@berkeley.edu> <arokem@gmail.com>
 Arman Eshaghi <arman.eshaghi@gmail.com>

.zenodo.json

@@ -387,6 +387,11 @@
       "name": "Iqbal, Shariq",
       "orcid": "0000-0003-2766-8425"
     },
+    {
+      "affiliation": "Department of Psychology, University of Bielefeld, Bielefeld, Germany.",
+      "name": "Doll, Anna",
+      "orcid": "0000-0002-0799-0831"
+    },
     {
       "affiliation": "University of Iowa",
       "name": "Welch, David"
@@ -765,11 +770,6 @@
       "name": "Mihai, Paul Glad",
       "orcid": "0000-0001-5715-6442"
     },
-    {
-      "affiliation": "Department of Psychology, University of Bielefeld, Bielefeld, Germany.",
-      "name": "Doll, Anna",
-      "orcid": "0000-0002-0799-0831"
-    },
     {
       "affiliation": "Department of Psychology, Stanford University",
       "name": "Gorgolewski, Krzysztof J.",

doc/changelog/1.X.X-changelog.rst

@@ -1,3 +1,11 @@
+1.4.2 (February 14, 2020)
+=========================
+(`Full changelog <https://github.com/nipy/nipype/milestone/1.4.2?closed=1>`__)
+
+  * FIX: Allow ``fsl.MultipleRegressDesign`` to create multiple F-tests (https://github.com/nipy/nipype/pull/3166)
+  * FIX: Reliably parse SGE job IDs in the presence of warnings (https://github.com/nipy/nipype/pull/3168)
+  * FIX: Move TraitType import, handle API change for NoDefaultSpecified (https://github.com/nipy/nipype/pull/3159)
+
 1.4.1 (January 27, 2020)
 ========================
 (`Full changelog <https://github.com/nipy/nipype/milestone/1.4.1?closed=1>`__)

doc/interfaces.rst

@@ -8,7 +8,7 @@ Interfaces and Workflows
 :Release: |version|
 :Date: |today|
 
-Previous versions: `1.4.1 <http://nipype.readthedocs.io/en/1.4.1/>`_ `1.4.0 <http://nipype.readthedocs.io/en/1.4.0/>`_
+Previous versions: `1.4.2 <http://nipype.readthedocs.io/en/1.4.2/>`_ `1.4.1 <http://nipype.readthedocs.io/en/1.4.1/>`_
 
 Workflows
 ---------