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

Job	Run time
Start Gate	1s
Run Linters	2m 30s
Collect data for other tasks	14s
Compile Maps	2m 34s
Windows Build	1m 44s
Integration Tests (icebox) / run_integration_tests	9m 55s
Integration Tests (birdshot) / run_integration_tests	10m 34s
Integration Tests (deltastation) / run_integration_tests	10m 59s
Integration Tests (gateway_test) / run_integration_tests	10m 40s
Integration Tests (metastation) / run_integration_tests	10m 25s
Integration Tests (multiz_debug) / run_integration_tests	10m 8s
Integration Tests (nebulastation) / run_integration_tests	11m 6s
Integration Tests (runtimestation) / run_integration_tests	9m 12s
Integration Tests (tramstation) / run_integration_tests	10m 51s
Alternate Tests (515, 1627, runtimestation) / run_integration_tests	8m 54s
Integration Tests (wawastation) / run_integration_tests	10m 54s
Compare Screenshot Tests	0s
Completion Gate	3s
	2h 0m 44s

Provide feedback