Upstream merge, good lord. #639

Job	Run time
Start Gate	1s
Collect data and setup caches for other tasks	19s
Run Linters	3m 5s
Compile Maps	4m 3s
Windows Build	2m 15s
Integration Tests (deltastation) / run_integration_tests	14m 12s
Integration Tests (gateway_test) / run_integration_tests	13m 49s
Integration Tests (kilostation) / run_integration_tests	14m 20s
Integration Tests (metastation) / run_integration_tests	14m 16s
Integration Tests (multiz_debug) / run_integration_tests	13m 9s
Integration Tests (runtimestation) / run_integration_tests	11m 43s
Integration Tests (snowglobe) / run_integration_tests	13m 18s
Integration Tests (voidraptor) / run_integration_tests	14m 23s
Alternate Tests (515, 1637, runtimestation) / run_integration_tests	11m 44s
Alternate Tests (516, 1648, runtimestation, 516) / run_integration_tests	12m 23s
Compare Screenshot Tests	0s
Completion Gate	3s
	2h 23m 3s

Provide feedback