Merge remote branch 'origin/master' into samual/updatecommands

Conflicts:
	defaultXonotic.cfg

diff --cc defaultXonotic.cfg
index d07603b6b692e7b7b009e11f8abd75b021976509,5535d9cceea250f59dc2d592ec28fe929ec17229..9e443b846a4b500a6a3e5cb733d634192aa3e396
--- 1/defaultXonotic.cfg
--- 2/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -953,7 -995,10 +953,8 @@@ seta cl_notify_carried_items "3" "notif
  
  // startmap_dm is used when running with the -listen or -dedicated commandline options
  set serverconfig server.cfg
- alias startmap_dm "set _sv_init 0; map _init/_init; exec $serverconfig; set _sv_init 1; map _init/_init"
+ set _sv_init 0
+ alias startmap_dm "set _sv_init 0; map _init/_init; exec $serverconfig; set _sv_init 1"
 -alias sv_loadconfig "exec $serverconfig"
 -alias sv_restart "say \"Server will restart at the end of the match, you will all be reconnected automatically. $* \"; quit_and_redirect self"
  
  // aliases:
  alias +fire +attack