Merge remote-tracking branch 'upstream/master' #182

Job	Run time
Collect data for other tasks	16s
Run Linters	2m 29s
Compile Maps	2m 21s
Windows Build	1m 37s
Integration Tests (gateway_test) / run_integration_tests	9m 37s
Integration Tests (deltastation) / run_integration_tests	8m 33s
Integration Tests (birdshot) / run_integration_tests	8m 24s
Alternate Tests (515, 1627, runtimestation) / run_integration_tests	7m 28s
Integration Tests (icebox) / run_integration_tests	8m 50s
Integration Tests (metastation) / run_integration_tests	9m 15s
Integration Tests (multiz_debug) / run_integration_tests	7m 39s
Integration Tests (northstar) / run_integration_tests	9m 43s
Integration Tests (tramstation) / run_integration_tests	8m 40s
Integration Tests (runtimestation) / run_integration_tests	7m 22s
Integration Tests (wawastation) / run_integration_tests	8m 45s
Check Alternate Tests	1s
Compare Screenshot Tests	17s
	1h 41m 17s

Provide feedback