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

Job	Run time
Collect data for other tasks	43s
Run Linters	1m 43s
Compile Maps	2m 19s
Windows Build	1m 23s
Integration Tests (birdshot) / run_integration_tests	8m 26s
Integration Tests (deltastation) / run_integration_tests	8m 46s
Integration Tests (gateway_test) / run_integration_tests	9m 31s
Integration Tests (icebox) / run_integration_tests	8m 55s
Integration Tests (metastation) / run_integration_tests	8m 36s
Integration Tests (multiz_debug) / run_integration_tests	7m 50s
Integration Tests (northstar) / run_integration_tests	9m 10s
Integration Tests (runtimestation) / run_integration_tests	7m 21s
Integration Tests (tramstation) / run_integration_tests	9m 7s
Alternate Tests (515, 1621, runtimestation) / run_integration_tests	7m 37s
Check Alternate Tests	1s
Compare Screenshot Tests	1m 38s
	1h 33m 6s

Provide feedback