fixed crash w/ adaptive + tree + local linear
Merge branch 'master' into npRmpi