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

Job	Run time
Start Gate	1s
Collect data for other tasks	17s
Run Linters	2m 44s
Windows Build	2m 17s
Compile Maps	3m 55s
Integration Tests (biodome) / run_integration_tests	12m 34s
Integration Tests (boxstation) / run_integration_tests	12m 27s
Integration Tests (deltastation) / run_integration_tests	12m 46s
Integration Tests (gateway_test) / run_integration_tests	14m 10s
Integration Tests (icebox) / run_integration_tests	13m 9s
Integration Tests (kilostation) / run_integration_tests	12m 17s
Integration Tests (metastation) / run_integration_tests	12m 31s
Integration Tests (moonstation) / run_integration_tests	13m 16s
Integration Tests (multiz_debug) / run_integration_tests	11m 31s
Integration Tests (runtimestation) / run_integration_tests	11m 9s
Integration Tests (tramstation) / run_integration_tests	12m 45s
Integration Tests (voidraptor) / run_integration_tests	12m 30s
Alternate Tests (515, 1627, runtimestation) / run_integration_tests	10m 53s
Compare Screenshot Tests	20s
Completion Gate	2s
	2h 51m 34s

Provide feedback