Merge pull request #512 from Sea-of-Lost-Souls/upstreammaint #2034

Job	Run time
Collect data for other tasks	15s
Run Linters	3m 30s
Compile Maps	3m 15s
Windows Build	1m 57s
Check Alternate Tests	0s
Integration Tests (blueshift) / run_integration_tests	11m 55s
Integration Tests (birdshot) / run_integration_tests	10m 46s
Integration Tests (deltastation) / run_integration_tests	10m 56s
Integration Tests (gateway_test) / run_integration_tests	12m 28s
Integration Tests (icebox) / run_integration_tests	12m 17s
Integration Tests (manaforge) / run_integration_tests	11m 43s
Integration Tests (metastation) / run_integration_tests	11m 15s
Integration Tests (multiz_debug) / run_integration_tests	10m 38s
Integration Tests (northstar) / run_integration_tests	12m 19s
Integration Tests (pubbystation) / run_integration_tests	11m 4s
Integration Tests (tramstation) / run_integration_tests	11m 27s
Integration Tests (runtimestation) / run_integration_tests	9m 55s
Integration Tests (voidraptor) / run_integration_tests	11m 29s
Compare Screenshot Tests	2m 48s
	2h 39m 57s

Provide feedback