Merge branch 'master' of https://github.com/eile/CMake

Conflicts:
	SubProject.cmake