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

Job	Run time
Collect data for other tasks	12s
Run Linters	2m 33s
Compile Maps	2m 21s
Windows Build	1m 42s
Integration Tests (deltastation) / run_integration_tests	8m 40s
Integration Tests (birdshot) / run_integration_tests	8m 26s
Integration Tests (gateway_test) / run_integration_tests	10m 1s
Integration Tests (icebox) / run_integration_tests	9m 0s
Integration Tests (metastation) / run_integration_tests	8m 28s
Integration Tests (multiz_debug) / run_integration_tests	7m 43s
Integration Tests (northstar) / run_integration_tests	9m 41s
Integration Tests (runtimestation) / run_integration_tests	7m 22s
Integration Tests (tramstation) / run_integration_tests	8m 54s
Integration Tests (wawastation) / run_integration_tests	8m 45s
Alternate Tests (515, 1627, runtimestation) / run_integration_tests	7m 29s
Check Alternate Tests	1s
Compare Screenshot Tests	13s
	1h 41m 31s

Provide feedback