Merge Xonotic Git

Commit 322fa468ebed734092071477b9737652f039cebe

    Conflicts:
    	qcsrc/server/sv_main.qc