nipy trunk before failed merge from neurospin