Merge branch '3.1.x' #4290

Job	Run time
build	3m 12s
test_when_cache_missing	0s
test_when_cache_present (0, 7, 688)	23m 44s
test_when_cache_present (1, 7, 688)	22m 49s
test_when_cache_present (2, 7, 688)	26m 34s
test_when_cache_present (3, 7, 688)	23m 6s
test_when_cache_present (4, 7, 688)	24m 47s
test_when_cache_present (5, 7, 688)	24m 4s
test_when_cache_present (6, 7, 688)	24m 18s
test_when_cache_present (7, 7, 688)	10m 28s
save_test_times_when_cache_missing	0s
save_test_times_when_cache_present	4s
	3h 3m 6s

Provide feedback