Merge branch 'master' into beacons

Conflicts:
	src/gamelogic/cgame/cg_local.h