Merge changes from latest Xonotic Git