Merge remote-tracking branch 'upstream/master' into fix/prov

* upstream/master:
  add a finally statement in _node_runner
  Minor typo in comment
  Follow upstream capitalization of MRIcron
  Minor typo in comment
  Follow upstream capitalization of MRIcron

Author: satra

nipype/interfaces/dcm2nii.py

@@ -49,7 +49,7 @@ class Dcm2niiOutputSpec(TraitedSpec):
 
 
 class Dcm2nii(CommandLine):
-    """Uses MRICRON's dcm2nii to convert dicom files
+    """Uses MRIcron's dcm2nii to convert dicom files
 
     Examples
     ========
@@ -107,7 +107,7 @@ def _parse_stdout(self, stdout):
                 if line.startswith("Saving "):
                     out_file = line[len("Saving "):]
                 elif line.startswith("GZip..."):
-                    # for gzipped outpus files are not absolute
+                    # for gzipped output files are not absolute
                     fname = line[len("GZip..."):]
                     if len(files) and os.path.basename(files[-1]) == fname[:-3]:
                         # we are seeing a previously reported conversion

nipype/pipeline/engine/nodes.py

@@ -1151,7 +1151,8 @@ def _node_runner(self, nodes, updatehash=False):
                 if str2bool(self.config['execution']['stop_on_first_crash']):
                     self._result = node.result
                     raise
-            yield i, node, err
+            finally:
+                yield i, node, err
 
     def _collate_results(self, nodes):
         self._result = InterfaceResult(interface=[], runtime=[],