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

Job	Run time
Run Linters	2m 20s
Collect data for other tasks	10s
Windows Build	1m 31s
Compile Maps	2m 23s
Integration Tests (deltastation) / run_integration_tests	8m 36s
Integration Tests (birdshot) / run_integration_tests	8m 38s
Integration Tests (gateway_test) / run_integration_tests	9m 32s
Integration Tests (icebox) / run_integration_tests	8m 55s
Integration Tests (metastation) / run_integration_tests	8m 31s
Integration Tests (multiz_debug) / run_integration_tests	7m 40s
Integration Tests (northstar) / run_integration_tests	9m 35s
Integration Tests (runtimestation) / run_integration_tests	7m 22s
Integration Tests (tramstation) / run_integration_tests	8m 41s
Alternate Tests (515, 1627, runtimestation) / run_integration_tests	7m 21s
Check Alternate Tests	1s
Compare Screenshot Tests	23s
	1h 31m 39s

Provide feedback