update from warzone2100:master