Merging in master for CMake in Travis