Merge branch 'master' into openal-soft_port

Conflicts:
	code/CMakeLists.txt
	code/client/OpenAL/al.h
	code/client/OpenAL/alc.h
	code/client/OpenAL/alctypes.h
	codemp/CMakeLists.txt