Merge branch 'master' into fix-build
Fiddled around with HBS to get it to compile.
Merge branch 'fix-build'