This is 2.4.1 from now on
Merge branch 'release'

Conflicts:
	CMakeLists.txt