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

Job	Run time
Run Linters	2m 22s
Collect data for other tasks	11s
Windows Build	1m 42s
Compile Maps	2m 26s
Integration Tests (icebox) / run_integration_tests	12m 18s
Integration Tests (birdshot) / run_integration_tests	8m 46s
Integration Tests (gateway_test) / run_integration_tests	9m 24s
Integration Tests (deltastation) / run_integration_tests	8m 23s
Integration Tests (metastation) / run_integration_tests	8m 38s
Integration Tests (multiz_debug) / run_integration_tests	7m 40s
Integration Tests (northstar) / run_integration_tests	9m 28s
Integration Tests (runtimestation) / run_integration_tests	7m 31s
Integration Tests (tramstation) / run_integration_tests	8m 51s
Integration Tests (wawastation) / run_integration_tests	8m 48s
Alternate Tests (515, 1627, runtimestation) / run_integration_tests	7m 30s
Check Alternate Tests	1s
Compare Screenshot Tests	0s
	1h 43m 59s

Provide feedback