Merge latest changes from Xonotic Git