fixed a tree / cvaic interaction glitch
Merge branch 'master' into npRmpi