Merge branch 'master' into bhh-branch
Merge pull request #1 from bhhbazinga/bhh-branch

Merge branch 'master' into bhh-branch