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

Job	Run time
Collect data for other tasks	16s
Run Linters	2m 43s
Compile Maps	2m 52s
Windows Build	1m 49s
Integration Tests (birdshot) / run_integration_tests	8m 42s
Integration Tests (deltastation) / run_integration_tests	8m 56s
Integration Tests (gateway_test) / run_integration_tests	9m 16s
Integration Tests (icebox) / run_integration_tests	8m 51s
Integration Tests (metastation) / run_integration_tests	8m 36s
Integration Tests (multiz_debug) / run_integration_tests	8m 1s
Integration Tests (northstar) / run_integration_tests	9m 44s
Integration Tests (runtimestation) / run_integration_tests	7m 28s
Integration Tests (tramstation) / run_integration_tests	9m 6s
Alternate Tests (515, 1621, runtimestation) / run_integration_tests	7m 36s
Check Alternate Tests	1s
Compare Screenshot Tests	34s
	1h 34m 31s

Provide feedback