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

Job	Run time
Run Linters	2m 54s
Collect data for other tasks	12s
Windows Build	1m 42s
Compile Maps	2m 23s
Integration Tests (icebox) / run_integration_tests	8m 56s
Integration Tests (deltastation) / run_integration_tests	8m 40s
Integration Tests (birdshot) / run_integration_tests	8m 30s
Integration Tests (gateway_test) / run_integration_tests	9m 43s
Integration Tests (metastation) / run_integration_tests	8m 36s
Integration Tests (multiz_debug) / run_integration_tests	7m 48s
Integration Tests (northstar) / run_integration_tests	9m 26s
Integration Tests (runtimestation) / run_integration_tests	7m 36s
Integration Tests (tramstation) / run_integration_tests	8m 58s
Integration Tests (wawastation) / run_integration_tests	9m 20s
Alternate Tests (515, 1627, runtimestation) / run_integration_tests	7m 34s
Check Alternate Tests	1s
Compare Screenshot Tests	0s
	1h 42m 19s

Provide feedback