Function Automask raises error due to string '-apply_prefix <undefined>' generated in the 3dAutomask command
Merge remote-tracking branch 'upstream/master'
Added the option for resampling with isotropic voxels as available in FLIRT but not wrapped in NiPype
Update

Merge remote-tracking branch 'upstream/master'
Postpone FSL Flirt apply_isoxfm for a different PR
Merge remote-tracking branch 'upstream/master'

Conflicts:
	nipype/interfaces/afni/preprocess.py
Add missing option apply_isoxfm to FSL Flirt wrapper
Solve merge issue
Solve Merge issue
Added XOR condition between apply_isoxfm and apply_xfm
Merge pull request #605 from mick-d/master

Add missing option apply_isoxfm to FSL Flirt wrapper