Merge branch '3.1.x' #4250

Job	Run time
build	2m 48s
test_when_cache_missing	0s
test_when_cache_present (0, 8, 643)	22m 15s
test_when_cache_present (1, 8, 643)	21m 54s
test_when_cache_present (2, 8, 643)	20m 55s
test_when_cache_present (3, 8, 643)	30m 55s
test_when_cache_present (4, 8, 643)	23m 54s
test_when_cache_present (5, 8, 643)	24m 2s
test_when_cache_present (6, 8, 643)	22m 23s
test_when_cache_present (7, 8, 643)	23m 28s
test_when_cache_present (8, 8, 643)	11m 39s
save_test_times_when_cache_missing	0s
save_test_times_when_cache_present	9s
	3h 24m 22s

Provide feedback