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

Job	Run time
Collect data for other tasks	13s
Run Linters	1m 39s
Compile Maps	2m 9s
Windows Build	1m 29s
Integration Tests (gateway_test) / run_integration_tests	9m 8s
Integration Tests (birdshot) / run_integration_tests	8m 24s
Integration Tests (deltastation) / run_integration_tests	9m 6s
Integration Tests (icebox) / run_integration_tests	8m 49s
Integration Tests (metastation) / run_integration_tests	8m 31s
Integration Tests (multiz_debug) / run_integration_tests	8m 0s
Integration Tests (northstar) / run_integration_tests	9m 14s
Integration Tests (runtimestation) / run_integration_tests	7m 38s
Integration Tests (tramstation) / run_integration_tests	8m 48s
Alternate Tests (515, 1621, runtimestation) / run_integration_tests	7m 32s
Check Alternate Tests	1s
Compare Screenshot Tests	35s
	1h 31m 16s

Provide feedback