moved a declaration
Merge branch 'master' into npRmpi