Fix A3 after gamespy

Could probably apply the same to A2 and A1, however I have no way of testing
Merge remote-tracking branch 'will-hart/master'