Update CMakeLists for older versions
Merge branch 'omaster'

Conflicts:
	CMakeLists.txt