Upstream merge as of Aug 25 #2739

Job	Run time
Compile Maps	51s
Lint with OpenDream	26s
Find Maps to Test	8s
Run Linters	2m 1s
Windows Build	1m 1s
Alternate Tests	0s
Check Alternate Tests	0s
Unit Tests (almayer) / run_unit_tests	3m 23s
Unit Tests (chinook) / run_unit_tests	3m 14s
Unit Tests (bigredv2) / run_unit_tests	3m 20s
Unit Tests (chapaev) / run_unit_tests	3m 4s
Unit Tests (corsat) / run_unit_tests	3m 10s
Unit Tests (derelict_almayer) / run_unit_tests	3m 21s
Unit Tests (desert_dam) / run_unit_tests	3m 12s
Unit Tests (fiorina_sciannex) / run_unit_tests	3m 16s
Unit Tests (golden_arrow) / run_unit_tests	2m 59s
Unit Tests (golden_arrow_classic) / run_unit_tests	3m 3s
Unit Tests (ice_colony_v1) / run_unit_tests	3m 14s
Unit Tests (kutjevo) / run_unit_tests	3m 13s
Unit Tests (ice_colony_v2) / run_unit_tests	3m 9s
Unit Tests (lv522_chances_claim) / run_unit_tests	3m 13s
Unit Tests (lv624) / run_unit_tests	3m 8s
Unit Tests (lv624_repaired) / run_unit_tests	3m 15s
Unit Tests (new_varadero) / run_unit_tests	3m 8s
Unit Tests (new_varadero_repaired) / run_unit_tests	3m 5s
Unit Tests (prison_station_fop) / run_unit_tests	3m 9s
Unit Tests (rover) / run_unit_tests	2m 58s
Unit Tests (runtime) / run_unit_tests	2m 57s
Unit Tests (shivas_snowball) / run_unit_tests	3m 12s
Unit Tests (runtime_multiz) / run_unit_tests	3m 2s
Unit Tests (sorokyne_strata) / run_unit_tests	3m 12s
Unit Tests (whiskey_outpost_v2) / run_unit_tests	3m 9s
	1h 23m 33s

Provide feedback