Master upstream merge 2 #43

Job	Run time
Collect data for other tasks	11s
Run Linters	1m 51s
Compile Maps	2m 17s
Windows Build	1m 40s
Integration Tests (birdshot) / run_integration_tests	8m 16s
Integration Tests (deltastation) / run_integration_tests	9m 44s
Integration Tests (gateway_test) / run_integration_tests	9m 6s
Integration Tests (icebox) / run_integration_tests	8m 34s
Integration Tests (metastation) / run_integration_tests	8m 14s
Integration Tests (multiz_debug) / run_integration_tests	7m 30s
Integration Tests (northstar) / run_integration_tests	9m 10s
Integration Tests (runtimestation) / run_integration_tests	7m 17s
Integration Tests (tramstation) / run_integration_tests	8m 35s
Alternate Tests (515, 1621, runtimestation) / run_integration_tests	7m 40s
Check Alternate Tests	1s
Compare Screenshot Tests	35s
	1h 30m 41s

Provide feedback