Merge "Use CMake by default" into devel/master