Fix for FloodFill
Merge branch 'enh/conductivity' of github.com:swederik/nipype into enh/conductivity