Merge branch 'master' into augmented-bstree-pullreq
Merge branch 'augmented-bstree-pullreq' into augmented-bstree