Merge remote-tracking branch 'origin/master' into HEAD #4

Job	Run time
Run Linters	2m 11s
Collect data for other tasks	12s
Windows Build	1m 31s
Compile Maps	2m 14s
Integration Tests (deltastation) / run_integration_tests	8m 33s
Integration Tests (birdshot) / run_integration_tests	8m 46s
Integration Tests (gateway_test) / run_integration_tests	9m 18s
Integration Tests (icebox) / run_integration_tests	9m 5s
Integration Tests (metastation) / run_integration_tests	8m 42s
Integration Tests (multiz_debug) / run_integration_tests	7m 56s
Integration Tests (northstar) / run_integration_tests	9m 41s
Integration Tests (runtimestation) / run_integration_tests	7m 38s
Integration Tests (tramstation) / run_integration_tests	8m 52s
Alternate Tests (515, 1627, runtimestation) / run_integration_tests	7m 39s
Check Alternate Tests	1s
Compare Screenshot Tests	22s
	1h 32m 41s

Provide feedback