Update test functions BEFORE tests
Merge remote-tracking branch 'upstream/master' into makefile
Merge pull request #932 from mick-d/makefile

Update test functions BEFORE tests
BF: include nipype.workflows.data into setup.py
Merge pull request #942 from yarikoptic/master

BF: include nipype.workflows.data into setup.py
BF: include nipype.workflows.data also as a data_dir into setup.py
Merge pull request #943 from yarikoptic/master

BF: include nipype.workflows.data also as a data_dir into setup.py
SPM12 outputs .nii instead of .img/.hdr
change location of templates and gaussian parameters for SPM12 segment
revert MCR related change
Merge pull request #945 from chrisfilo/fix/spm12

Fix/spm12
Topup inputs check. Close #948
Merge branch 'fix/TOPUPOddImageSizes' into experimental