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

Job	Run time
Run Linters	2m 1s
Collect data for other tasks	18s
Windows Build	1m 34s
Compile Maps	2m 27s
Integration Tests (gateway_test) / run_integration_tests	9m 22s
Integration Tests (birdshot) / run_integration_tests	8m 17s
Integration Tests (deltastation) / run_integration_tests	8m 33s
Integration Tests (multiz_debug) / run_integration_tests	8m 30s
Integration Tests (metastation) / run_integration_tests	8m 22s
Integration Tests (icebox) / run_integration_tests	8m 33s
Integration Tests (northstar) / run_integration_tests	10m 7s
Integration Tests (runtimestation) / run_integration_tests	7m 23s
Integration Tests (tramstation) / run_integration_tests	8m 44s
Alternate Tests (515, 1627, runtimestation) / run_integration_tests	7m 39s
Check Alternate Tests	1s
Compare Screenshot Tests	0s
	1h 31m 51s

Provide feedback