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

Job	Run time
Collect data for other tasks	12s
Run Linters	1m 43s
Windows Build	1m 38s
Compile Maps	2m 14s
Integration Tests (birdshot) / run_integration_tests	8m 15s
Integration Tests (deltastation) / run_integration_tests	8m 23s
Integration Tests (gateway_test) / run_integration_tests	10m 4s
Integration Tests (metastation) / run_integration_tests	8m 32s
Integration Tests (icebox) / run_integration_tests	8m 49s
Integration Tests (multiz_debug) / run_integration_tests	7m 58s
Integration Tests (northstar) / run_integration_tests	9m 20s
Integration Tests (runtimestation) / run_integration_tests	7m 49s
Integration Tests (tramstation) / run_integration_tests	8m 40s
Alternate Tests (515, 1621, runtimestation) / run_integration_tests	7m 50s
Check Alternate Tests	1s
Compare Screenshot Tests	31s
	1h 31m 59s

Provide feedback