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

Job	Run time
Start Gate	1s
Run Linters	2m 40s
Collect data and setup caches for other tasks	12s
Windows Build	1m 50s
Compile Maps	2m 25s
Integration Tests / run (birdshot) / Run Tests (birdshot; 515)	10m 43s
Integration Tests / run (deltastation) / Run Tests (deltastation; 515)	11m 5s
Integration Tests / run (gateway_test) / Run Tests (gateway_test; 515)	11m 21s
Integration Tests / run (icebox) / Run Tests (icebox; 515)	9m 49s
Integration Tests / run (metastation) / Run Tests (metastation; 515)	10m 31s
Integration Tests / run (multiz_debug) / Run Tests (multiz_debug; 515)	10m 12s
Integration Tests / run (nebulastation) / Run Tests (nebulastation; 515)	11m 30s
Integration Tests / run (runtimestation) / Run Tests (runtimestation; 515)	9m 0s
Integration Tests / run (tramstation) / Run Tests (tramstation; 515)	11m 3s
Alternate Tests / run (515, 1642, runtimestation) / Run Tests (515.1642; runtimestation; 515)	8m 40s
Integration Tests / run (wawastation) / Run Tests (wawastation; 515)	11m 4s
Alternate Tests / run (516, 1648, runtimestation, 516) / Run Tests (516.1648; runtimestation; 516)	9m 7s
Compare Screenshot Tests	16s
Completion Gate	2s
	2h 11m 31s

Provide feedback