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

Job	Run time
Run Linters	2m 22s
Collect data for other tasks	12s
Compile Maps	2m 25s
Windows Build	1m 48s
Integration Tests (gateway_test) / run_integration_tests	9m 40s
Integration Tests (birdshot) / run_integration_tests	8m 42s
Integration Tests (icebox) / run_integration_tests	9m 15s
Integration Tests (deltastation) / run_integration_tests	9m 0s
Integration Tests (multiz_debug) / run_integration_tests	7m 52s
Integration Tests (metastation) / run_integration_tests	8m 57s
Integration Tests (northstar) / run_integration_tests	9m 50s
Integration Tests (runtimestation) / run_integration_tests	7m 46s
Integration Tests (wawastation) / run_integration_tests	9m 2s
Integration Tests (tramstation) / run_integration_tests	9m 10s
Alternate Tests (515, 1627, runtimestation) / run_integration_tests	7m 45s
Check Alternate Tests	1s
Compare Screenshot Tests	14s
	1h 44m 1s

Provide feedback