Diff freeciv-3.1.0_beta2 with a freeciv-9999

Thank you!