Fix indenting on BBTree
Merge branch 'master' into rel-057