Merge some gametype vote fixes from Xonotic Git