Merge branch 'develop' into augmented-bstree-pullreq
Merge branch 'augmented-bstree-pullreq' into merge-mods