Syncing with upstream. Merge https://github.com/nipy/nipype
Syncing with upstream. Merge https://github.com/nipy/nipype

mick-d/nipype,mick-d/nipype,carolFrohlich/nipype,carolFrohlich/nipype,mick-d/nipype,carolFrohlich/nipype,FCP-INDI/nipype,mick-d/nipype,carolFrohlich/nipype,FCP-INDI/nipype,FCP-INDI/nipype,FCP-INDI/nipype