Removed unneeded compiler flag (Catch now fixed).
Merge remote-tracking branch 'origin/next' into drive_split

Conflicts:
	CMakeLists.txt