Merge branch '3.1.x' #4295

Job	Run time
build	2m 49s
test_when_cache_missing	0s
test_when_cache_present (0, 7, 690)	24m 32s
test_when_cache_present (1, 7, 690)	23m 28s
test_when_cache_present (2, 7, 690)	23m 28s
test_when_cache_present (3, 7, 690)	25m 25s
test_when_cache_present (4, 7, 690)	22m 40s
test_when_cache_present (5, 7, 690)	27m 0s
test_when_cache_present (6, 7, 690)	24m 57s
test_when_cache_present (7, 7, 690)	10m 14s
save_test_times_when_cache_missing	0s
save_test_times_when_cache_present	33s
	3h 5m 6s

Provide feedback