Changes needed for sub project integration
Merge branch 'master' of https://github.com/eile/CMake
Merge branch 'master' of https://github.com/eile/CMake