Merge Xonotic Master

Commit 38aa70b2b5a9344f9d1eb9b07024ca37ac61f317