Merge upstream 14.10.24 #2107

Job	Run time
Start Gate	1s
Run Linters	2m 48s
Collect data for other tasks	17s
Compile Maps	2m 34s
Windows Build	1m 47s
Integration Tests (deltastation) / run_integration_tests	9m 22s
Integration Tests (birdshot) / run_integration_tests	9m 33s
Integration Tests (gateway_test) / run_integration_tests	10m 28s
Integration Tests (icebox) / run_integration_tests	10m 4s
Integration Tests (metastation) / run_integration_tests	9m 23s
Integration Tests (multiz_debug) / run_integration_tests	8m 52s
Integration Tests (northstar) / run_integration_tests	10m 31s
Integration Tests (runtimestation) / run_integration_tests	8m 11s
Integration Tests (tramstation) / run_integration_tests	9m 39s
Integration Tests (wawastation) / run_integration_tests	9m 52s
Alternate Tests (515, 1627, runtimestation) / run_integration_tests	8m 13s
Compare Screenshot Tests	19s
Completion Gate	4s
	1h 51m 58s

Provide feedback