fix multi-normal-drift
Merge branch 'master' into jan2015