Fixes for clang cpp builds
Merge branch 'master' of github.com:/culvertsoft/mgen