Merge remote-tracking branch 'upstream/master' into enh/et

* upstream/master:
  TEST: Mark test_dcm2niix_dti XFAIL

Author: satra

nipype/interfaces/tests/test_extra_dcm2nii.py

@@ -29,6 +29,7 @@ def _fetch_data(datadir, dicoms):
 
 @pytest.mark.skipif(no_datalad, reason="Datalad required")
 @pytest.mark.skipif(no_dcm2niix, reason="Dcm2niix required")
+@pytest.mark.xfail(reason="Intermittent failures. Let's come back to this later.")
 def test_dcm2niix_dti(fetch_data, tmpdir):
     tmpdir.chdir()
     datadir = tmpdir.mkdir('data').strpath