merged fixel2voxel changes from fixelstats branch