merge nipype updates