Re-add some modules needed by CMake < 3.0
Merge branch 'master' into release