Merge remote-tracking branch 'Paxilmaniac/master' #12

Job	Run time
Collect data for other tasks	16s
Run Linters	2m 49s
Windows Build	1m 35s
Compile Maps	2m 45s
Integration Tests (icebox) / run_integration_tests	9m 20s
Integration Tests (gateway_test) / run_integration_tests	9m 59s
Integration Tests (deltastation) / run_integration_tests	9m 36s
Integration Tests (birdshot) / run_integration_tests	9m 6s
Integration Tests (metastation) / run_integration_tests	8m 51s
Integration Tests (multiz_debug) / run_integration_tests	8m 4s
Integration Tests (northstar) / run_integration_tests	9m 34s
Integration Tests (runtimestation) / run_integration_tests	8m 4s
Integration Tests (tramstation) / run_integration_tests	9m 15s
Integration Tests (wawastation) / run_integration_tests	9m 12s
Alternate Tests (515, 1627, runtimestation) / run_integration_tests	7m 57s
Check Alternate Tests	1s
Compare Screenshot Tests	28s
	1h 46m 52s

Provide feedback