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