Merge branch 'master' into enh/dcmstack

* master:
  add DicomImport to spm init.py
  fix merge conflict in CHANGES
  add interface for spm's dicom import
  spm wants a two-item array here
  Fence matplotlib import with try block
  Get backend configurable from node config
  Set matplotlib backend from config in pyscript
  Attempt to set backend in local matplotlib
  fix: matplotlib import to inside function
fix siemens slice order extraction
Merge remote branch 'nipype/master' into enh/dcmstack

* nipype/master: (178 commits)
  fix: ridiculous mistakes
  fix: make sure mandatory=False items are displayed
  fix: mesh import to enable doc building
  doctest fixes
  docs and changelog
  changelog
  Fixed tests
  enh: added options to execute script from command line
  fix: fix env again
  fix: proper environment access
  fix: tests and added new data files
  fix: updated checking script
  fix: updating fsl metadata
  fix: updated all inappropriate metadata  (fsl update in separate commit)
  Added nocheck option in fielmap_correction
  enh: added script to check metadata
  Fixed cmdline commands in docstrings
  Revert "Run autopep8 on misc.py"
  Fixed failed test
  Fixed errors in Doctest (?)
  ...
fix siemens effective echo spacing computation
Merge branch 'enh/dcmstack' into testing

* enh/dcmstack:
  fix siemens effective echo spacing computation
  fix siemens slice order extraction