Merge branch 'master' into engine-upgrade

Conflicts:
	CMakeLists.txt
	src/engine/client/cl_keys.c