Changes to be committed:
	modified:   CMakeLists.txt
Corrected merge error from last resync