update to 26575
Merge branch 'master' into longturn
Merge branch 'longturn' of github.com:longturn/freeciv-S2_5 into longturn