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

Job	Run time
Start Gate	1s
Collect data for other tasks	12s
Run Linters	3m 49s
Compile Maps	2m 35s
Windows Build	1m 48s
Integration Tests (deltastation) / run_integration_tests	9m 8s
Integration Tests (birdshot) / run_integration_tests	9m 0s
Alternate Tests (515, 1627, runtimestation) / run_integration_tests	7m 54s
Integration Tests (gateway_test) / run_integration_tests	10m 3s
Integration Tests (icebox) / run_integration_tests	9m 33s
Integration Tests (metastation) / run_integration_tests	8m 59s
Integration Tests (multiz_debug) / run_integration_tests	8m 21s
Integration Tests (northstar) / run_integration_tests	10m 21s
Integration Tests (runtimestation) / run_integration_tests	7m 51s
Integration Tests (tramstation) / run_integration_tests	9m 23s
Integration Tests (wawastation) / run_integration_tests	9m 29s
Compare Screenshot Tests	17s
Completion Gate	2s
	1h 48m 46s

Provide feedback