Update to Freeciv server r25694. Also update patch.