fixed regression regression
Merge branch 'master' into npRmpi