Merge upstream #869

Job	Run time
Collect data for other tasks	14s
Run Linters	2m 27s
Compile Maps	2m 32s
Windows Build	1m 36s
Integration Tests (birdshot) / run_integration_tests	8m 27s
Integration Tests (deltastation) / run_integration_tests	8m 43s
Integration Tests (gateway_test) / run_integration_tests	9m 34s
Integration Tests (icebox) / run_integration_tests	9m 8s
Integration Tests (metastation) / run_integration_tests	8m 32s
Integration Tests (multiz_debug) / run_integration_tests	7m 48s
Integration Tests (northstar) / run_integration_tests	9m 22s
Integration Tests (runtimestation) / run_integration_tests	7m 32s
Integration Tests (wawastation) / run_integration_tests	8m 43s
Integration Tests (tramstation) / run_integration_tests	9m 7s
Alternate Tests (515, 1627, runtimestation) / run_integration_tests	7m 22s
Check Alternate Tests	1s
Compare Screenshot Tests	15s
	1h 41m 23s

Provide feedback