Integrate common CMake stuff using git externals
Merge branch 'master' of https://github.com/eile/Collage