[Widelands-dev] [Merge] lp:~stephan-lutz/widelands/bug_1831499_empire3_fixes into lp:widelands

Continuous integration builds have changed state: Travis build 5277. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/562425741. Appveyor build 5052. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_stephan_lutz_widelands_bug_183149

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/ai_flag_warehouse_distance into lp:widelands

Continuous integration builds have changed state: Travis build 5278. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/562425929. Appveyor build 5053. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ai_flag_w