Merge remote-tracking branch 'origin/master' into samual/combined_updates

Merge remote-tracking branch 'origin/master' into samual/combined_updates

Conflicts:
	qcsrc/client/View.qc
	qcsrc/menu/xonotic/dialog_multiplayer_create.c
	qcsrc/menu/xonotic/dialog_multiplayer_media_demo.c
	qcsrc/menu/xonotic/dialog_multiplayer_playersetup_crosshair.c
	qcsrc/menu/xonotic/dialog_multiplayer_profile.c
	qcsrc/menu/xonotic/dialog_settings_audio.c
	qcsrc/menu/xonotic/dialog_settings_effects.c
	qcsrc/menu/xonotic/dialog_settings_game_view.c
	qcsrc/menu/xonotic/dialog_settings_input.c
	qcsrc/menu/xonotic/dialog_settings_user.c
	qcsrc/menu/xonotic/dialog_settings_video.c
	qcsrc/menu/xonotic/mainwindow.c
	qcsrc/menu/xonotic/serverlist.c
	qcsrc/menu/xonotic/util.qc