Merge branch 'brad'
Merge branch 'master' into brad
Merge branch 'brad' of https://github.com/ajrdesign/bluebeam-framework into brad