Merge branch 'master' into enh/GraftWorkflow

Conflicts:
	CHANGES

Author: oesteban

CHANGES

@@ -4,7 +4,6 @@ Next release
 * ENH: [Interfaced|Graft]Workflows (https://github.com/nipy/nipype/pull/882)
 * FIX: Enable absolute path definitions in DCMStack (https://github.com/nipy/nipype/pull/1089,
        replaced by https://github.com/nipy/nipype/pull/1093)
-* ENH: New algorithm: mesh.WarpPoints applies displacements fields to point sets.
 * ENH: New mesh.MeshWarpMaths to operate on surface-defined warpings
        (https://github.com/nipy/nipype/pull/1016)
 * FIX: Refactor P2PDistance, change name to ComputeMeshWarp, add regression tests,