Server fix in launcher.
Merge remote-tracking branch 'origin/master' into AH-339_game_launcher