Merge upstream #598

Job	Run time
Collect data for other tasks	11s
Run Linters	2m 17s
Compile Maps	2m 27s
Windows Build	1m 48s
Integration Tests (birdshot) / run_integration_tests	8m 42s
Integration Tests (deltastation) / run_integration_tests	8m 42s
Integration Tests (gateway_test) / run_integration_tests	9m 45s
Integration Tests (icebox) / run_integration_tests	9m 42s
Integration Tests (metastation) / run_integration_tests	8m 17s
Integration Tests (multiz_debug) / run_integration_tests	8m 0s
Integration Tests (northstar) / run_integration_tests	10m 2s
Integration Tests (runtimestation) / run_integration_tests	7m 27s
Integration Tests (tramstation) / run_integration_tests	9m 20s
Alternate Tests (515, 1627, runtimestation) / run_integration_tests	7m 16s
Check Alternate Tests	1s
Compare Screenshot Tests	14s
	1h 34m 11s

Provide feedback