Master upstream merge 2 (#28) #44

Job	Run time
Collect data for other tasks	10s
Run Linters	3m 37s
Compile Maps	2m 9s
Windows Build	2m 2s
Integration Tests (birdshot) / run_integration_tests	8m 26s
Integration Tests (deltastation) / run_integration_tests	8m 32s
Integration Tests (gateway_test) / run_integration_tests	9m 22s
Integration Tests (icebox) / run_integration_tests	9m 5s
Integration Tests (metastation) / run_integration_tests	8m 20s
Integration Tests (multiz_debug) / run_integration_tests	7m 56s
Integration Tests (northstar) / run_integration_tests	9m 9s
Integration Tests (runtimestation) / run_integration_tests	7m 22s
Integration Tests (tramstation) / run_integration_tests	8m 33s
Alternate Tests (515, 1621, runtimestation) / run_integration_tests	7m 51s
Check Alternate Tests	2s
Compare Screenshot Tests	57s
	1h 33m 33s

Provide feedback