Conflicts:
	src/CMakeLists.txt

Update the revision number to 2.4 to resolve the conflict