Merge branch 'master' into enh/NewAddNoiseInterface

Conflicts:
	nipype/algorithms/misc.py
Merge branch 'enh/NewAddNoiseInterface' into experimental

Conflicts:
	nipype/algorithms/misc.py