Update of CMake subtree to fix build for CMake < 2.8.8