Merge branch 'master' into terencehill/music_player

diff --cc defaultXonotic.cfg
index 580705ecc18b4f2054d84afdd0bec918574d63ab,dd16de9bc6ee4224b900bf576cfc86ff8e5fce20..4d25b246469f068cadfc11ecd7fdb3929765b130
--- 1/defaultXonotic.cfg
--- 2/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -1060,12 -1063,10 +1063,12 @@@ makesaved vid_gl1
  makesaved vid_gl20
  makesaved v_idlescale
  makesaved v_kicktime
 +makesaved music_playlist_list0
 +makesaved music_playlist_random0
  
  // ticrate
- //sys_ticrate 0.0166667
- sys_ticrate 0.0333333
+ //sys_ticrate 0.0166667 // 60fps. This would be ideal, but kills home routers.
+ sys_ticrate 0.0333333 // Use 30fps instead.
  cl_netfps 60 // should match or be a multiple
  sv_gameplayfix_delayprojectiles 0
  sv_gameplayfix_q2airaccelerate 1