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

Job	Run time
Start Gate	1s
Collect data for other tasks	10s
Run Linters	2m 27s
Compile Maps	2m 31s
Windows Build	1m 30s
Integration Tests (icebox) / run_integration_tests	9m 13s
Integration Tests (birdshot) / run_integration_tests	8m 50s
Integration Tests (gateway_test) / run_integration_tests	9m 48s
Integration Tests (deltastation) / run_integration_tests	9m 8s
Integration Tests (metastation) / run_integration_tests	8m 39s
Integration Tests (multiz_debug) / run_integration_tests	8m 7s
Integration Tests (northstar) / run_integration_tests	9m 55s
Integration Tests (runtimestation) / run_integration_tests	7m 49s
Integration Tests (tramstation) / run_integration_tests	9m 30s
Alternate Tests (515, 1627, runtimestation) / run_integration_tests	7m 46s
Integration Tests (wawastation) / run_integration_tests	8m 57s
Compare Screenshot Tests	15s
Completion Gate	2s
	1h 44m 38s

Provide feedback