found the *&)*(*&ed leak
Merge branch 'master' into npRmpi