Merge branch 'master' into Mario/killsound

diff --cc qcsrc/client/view.qc
Simple merge

diff --cc qcsrc/common/stats.qh
index edfa47fd417625ea24758a442ea44c720dbefe91,afde743241e8a78af627d8c298923a996fb402c7..44efee885ee2912487a68d1708e8cc3ddc623d88
--- 1/qcsrc/common/stats.qh
--- 2/qcsrc/common/stats.qh
+++ b/qcsrc/common/stats.qh
@@@ -126,8 -118,12 +118,13 @@@ REGISTER_STAT(CAPTURE_PROGRESS, float
  REGISTER_STAT(ENTRAP_ORB, float)
  REGISTER_STAT(ENTRAP_ORB_ALPHA, float)
  REGISTER_STAT(ITEMSTIME, int, autocvar_sv_itemstime)
 +REGISTER_STAT(KILL_TIME, float)
  
+ #ifdef SVQC
+ bool autocvar_g_ctf_leaderboard;
+ #endif
+ REGISTER_STAT(CTF_SHOWLEADERBOARD, bool, autocvar_g_ctf_leaderboard)
+ 
  #ifdef SVQC
  int autocvar_g_multijump;
  float autocvar_g_multijump_add;

diff --cc qcsrc/server/defs.qh
Simple merge

diff --cc qcsrc/server/g_damage.qc
Simple merge

diff --cc qcsrc/server/g_world.qc
Simple merge