fixed some regression regressions uncovered by Jeff
Merge branch 'master' into npRmpi