Merge some more changes from Xonotic Git