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

Job	Run time
Collect data for other tasks	12s
Run Linters	2m 18s
Compile Maps	2m 24s
Windows Build	1m 36s
Integration Tests (deltastation) / run_integration_tests	8m 45s
Integration Tests (birdshot) / run_integration_tests	8m 31s
Integration Tests (gateway_test) / run_integration_tests	9m 29s
Integration Tests (metastation) / run_integration_tests	8m 22s
Integration Tests (icebox) / run_integration_tests	8m 49s
Integration Tests (multiz_debug) / run_integration_tests	7m 34s
Integration Tests (northstar) / run_integration_tests	9m 13s
Integration Tests (runtimestation) / run_integration_tests	7m 15s
Integration Tests (tramstation) / run_integration_tests	8m 53s
Alternate Tests (515, 1627, runtimestation) / run_integration_tests	7m 23s
Check Alternate Tests	1s
Compare Screenshot Tests	15s
	1h 31m 0s

Provide feedback