Merging CMakeLists.txt from master into indigo_devel