Merge Xonotic Git master & fix some minor issues with keyhunt