another parallel critter gets squashed
Merge branch 'master' into npRmpi
another parallel bug crushed
Merge branch 'master' into npRmpi