fixed regression regressions from regression regression fixes
Merge branch 'master' into npRmpi