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

Job	Run time
Collect data for other tasks	13s
Run Linters	2m 23s
Windows Build	1m 34s
Compile Maps	2m 18s
Integration Tests (birdshot) / run_integration_tests	8m 27s
Integration Tests (gateway_test) / run_integration_tests	9m 33s
Integration Tests (deltastation) / run_integration_tests	8m 22s
Integration Tests (icebox) / run_integration_tests	9m 6s
Integration Tests (metastation) / run_integration_tests	8m 17s
Integration Tests (multiz_debug) / run_integration_tests	7m 33s
Integration Tests (northstar) / run_integration_tests	8m 42s
Integration Tests (runtimestation) / run_integration_tests	7m 22s
Integration Tests (tramstation) / run_integration_tests	9m 12s
Alternate Tests (515, 1627, runtimestation) / run_integration_tests	7m 24s
Check Alternate Tests	1s
Compare Screenshot Tests	14s
	1h 30m 41s

Provide feedback