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

Job	Run time
Start Gate	1s
Collect data for other tasks	12s
Run Linters	2m 31s
Compile Maps	2m 22s
Windows Build	1m 35s
Integration Tests (deltastation) / run_integration_tests	9m 16s
Integration Tests (gateway_test) / run_integration_tests	9m 49s
Integration Tests (birdshot) / run_integration_tests	8m 48s
Integration Tests (icebox) / run_integration_tests	9m 23s
Integration Tests (metastation) / run_integration_tests	8m 47s
Integration Tests (multiz_debug) / run_integration_tests	8m 0s
Integration Tests (northstar) / run_integration_tests	9m 41s
Integration Tests (runtimestation) / run_integration_tests	7m 42s
Integration Tests (tramstation) / run_integration_tests	9m 17s
Integration Tests (wawastation) / run_integration_tests	9m 9s
Alternate Tests (515, 1627, runtimestation) / run_integration_tests	7m 45s
Compare Screenshot Tests	24s
Completion Gate	2s
	1h 44m 44s

Provide feedback