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

Job	Run time
Collect data for other tasks	10s
Run Linters	2m 14s
Windows Build	1m 35s
Compile Maps	2m 15s
Integration Tests (birdshot) / run_integration_tests	8m 31s
Integration Tests (deltastation) / run_integration_tests	8m 22s
Integration Tests (gateway_test) / run_integration_tests	9m 28s
Integration Tests (icebox) / run_integration_tests	8m 43s
Integration Tests (metastation) / run_integration_tests	8m 42s
Integration Tests (multiz_debug) / run_integration_tests	7m 37s
Integration Tests (northstar) / run_integration_tests	9m 16s
Integration Tests (runtimestation) / run_integration_tests	7m 17s
Alternate Tests (515, 1627, runtimestation) / run_integration_tests	7m 24s
Integration Tests (tramstation) / run_integration_tests	8m 31s
Check Alternate Tests	1s
Compare Screenshot Tests	14s
	1h 30m 20s

Provide feedback