Merge latest Xonotic Git from branch Mario/weapons