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

Job	Run time
Run Linters	2m 55s
Collect data for other tasks	14s
Compile Maps	2m 28s
Windows Build	1m 29s
Integration Tests (gateway_test) / run_integration_tests	9m 44s
Integration Tests (birdshot) / run_integration_tests	8m 29s
Integration Tests (icebox) / run_integration_tests	8m 44s
Integration Tests (deltastation) / run_integration_tests	8m 54s
Integration Tests (metastation) / run_integration_tests	8m 22s
Integration Tests (multiz_debug) / run_integration_tests	7m 34s
Integration Tests (northstar) / run_integration_tests	9m 31s
Integration Tests (runtimestation) / run_integration_tests	7m 30s
Integration Tests (tramstation) / run_integration_tests	8m 50s
Integration Tests (wawastation) / run_integration_tests	8m 48s
Alternate Tests (515, 1627, runtimestation) / run_integration_tests	7m 34s
Check Alternate Tests	3s
Compare Screenshot Tests	21s
	1h 41m 30s

Provide feedback