Merge branch 'master' into terencehill/clear_button

diff --cc qcsrc/menu/item/inputbox.c
Simple merge

diff --cc qcsrc/menu/skin-customizables.inc
Simple merge

diff --cc qcsrc/menu/xonotic/dialog_multiplayer_demo.c
Simple merge

diff --cc qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c
Simple merge

diff --cc qcsrc/menu/xonotic/dialog_settings_misc.c
Simple merge

diff --cc qcsrc/menu/xonotic/dialog_settings_misc_cvars.c
Simple merge