Merging CMakeLists.txt from master into groovy_devel