compile fix for clang
Merge branch 'master' into cmake