Merge branch 'master' into 'jwinnie/bold-frag-message'

# Conflicts:
#   qcsrc/client/autocvars.qh

diff --cc qcsrc/client/autocvars.qh
index 992ba487b2eb8c5232fd48d4ee412e532f8bf2ed,4c6696cde139325c341095c9f5a612aee0850d60..452ad3dc46ff7537d869cff65d4fd8300fefdea1
--- 1/qcsrc/client/autocvars.qh
--- 2/qcsrc/client/autocvars.qh
+++ b/qcsrc/client/autocvars.qh
@@@ -242,10 -242,8 +242,10 @@@ float autocvar_hud_panel_centerprint_fa
  float autocvar_hud_panel_centerprint_fade_subsequent_minfontsize = 0.75;
  float autocvar_hud_panel_centerprint_fade_minfontsize = 0;
  bool autocvar_hud_panel_centerprint_flip;
 +bool autocvar_hud_panel_centerprint_fragmessage_bold;
 +bool autocvar_hud_panel_centerprint_fragmessage_capitalize;
  float autocvar_hud_panel_centerprint_fontscale;
- float autocvar_hud_panel_centerprint_fragmessage_fontscale;
 -float autocvar_hud_panel_centerprint_fontscale_bold = 1.8;
++float autocvar_hud_panel_centerprint_fragmessage_fontscale = 1.8;
  float autocvar_hud_panel_centerprint_time;
  bool autocvar_hud_panel_chat;
  bool autocvar_hud_panel_engineinfo;