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

Job	Run time
Run Linters	2m 14s
Collect data for other tasks	15s
Compile Maps	2m 16s
Windows Build	2m 30s
Integration Tests (deltastation) / run_integration_tests	8m 47s
Integration Tests (gateway_test) / run_integration_tests	9m 26s
Integration Tests (birdshot) / run_integration_tests	8m 40s
Integration Tests (icebox) / run_integration_tests	8m 51s
Integration Tests (metastation) / run_integration_tests	8m 30s
Integration Tests (multiz_debug) / run_integration_tests	7m 47s
Integration Tests (northstar) / run_integration_tests	9m 43s
Integration Tests (runtimestation) / run_integration_tests	7m 31s
Integration Tests (tramstation) / run_integration_tests	8m 47s
Alternate Tests (515, 1627, runtimestation) / run_integration_tests	7m 18s
Check Alternate Tests	1s
Compare Screenshot Tests	14s
	1h 32m 50s

Provide feedback