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

Job	Run time
Run Linters	1m 54s
Collect data for other tasks	11s
Compile Maps	2m 13s
Windows Build	1m 24s
Integration Tests (deltastation) / run_integration_tests	8m 29s
Integration Tests (birdshot) / run_integration_tests	8m 15s
Integration Tests (gateway_test) / run_integration_tests	9m 32s
Integration Tests (icebox) / run_integration_tests	8m 44s
Integration Tests (metastation) / run_integration_tests	8m 3s
Integration Tests (multiz_debug) / run_integration_tests	7m 45s
Integration Tests (northstar) / run_integration_tests	9m 22s
Integration Tests (runtimestation) / run_integration_tests	7m 24s
Integration Tests (tramstation) / run_integration_tests	8m 34s
Alternate Tests (515, 1621, runtimestation) / run_integration_tests	7m 33s
Check Alternate Tests	1s
Compare Screenshot Tests	1m 58s
	1h 31m 22s

Provide feedback