fixed some unused variable warnings
Merge branch 'master' into npRmpi