Sync cazfi with my latest development on freeciv-web.