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

Job	Run time
Run Linters	2m 29s
Collect data for other tasks	14s
Compile Maps	2m 19s
Windows Build	1m 33s
Integration Tests (deltastation) / run_integration_tests	8m 36s
Integration Tests (birdshot) / run_integration_tests	8m 26s
Integration Tests (icebox) / run_integration_tests	13m 3s
Integration Tests (gateway_test) / run_integration_tests	9m 32s
Integration Tests (metastation) / run_integration_tests	8m 36s
Integration Tests (northstar) / run_integration_tests	9m 31s
Integration Tests (multiz_debug) / run_integration_tests	7m 37s
Integration Tests (runtimestation) / run_integration_tests	7m 39s
Integration Tests (tramstation) / run_integration_tests	8m 39s
Integration Tests (wawastation) / run_integration_tests	8m 36s
Alternate Tests (515, 1627, runtimestation) / run_integration_tests	7m 27s
Check Alternate Tests	1s
Compare Screenshot Tests	0s
	1h 44m 18s

Provide feedback