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

Job	Run time
Run Linters	2m 28s
Collect data for other tasks	11s
Windows Build	2m 7s
Compile Maps	2m 28s
Integration Tests (gateway_test) / run_integration_tests	9m 44s
Integration Tests (deltastation) / run_integration_tests	8m 47s
Integration Tests (birdshot) / run_integration_tests	9m 0s
Integration Tests (icebox) / run_integration_tests	9m 13s
Integration Tests (metastation) / run_integration_tests	8m 42s
Integration Tests (multiz_debug) / run_integration_tests	8m 3s
Integration Tests (runtimestation) / run_integration_tests	7m 41s
Integration Tests (northstar) / run_integration_tests	9m 32s
Integration Tests (tramstation) / run_integration_tests	9m 13s
Integration Tests (wawastation) / run_integration_tests	8m 59s
Alternate Tests (515, 1627, runtimestation) / run_integration_tests	7m 34s
Check Alternate Tests	1s
Compare Screenshot Tests	13s
	1h 43m 56s

Provide feedback