Merge branch '3.0.x' #2467

Job	Run time
build	11m 30s
test_when_cache_present (0, 19)	29m 37s
test_when_cache_present (1, 19)	26m 3s
test_when_cache_present (2, 19)	32m 59s
test_when_cache_present (3, 19)	24m 51s
test_when_cache_present (4, 19)	25m 28s
test_when_cache_present (5, 19)	33m 7s
test_when_cache_present (6, 19)	31m 15s
test_when_cache_present (7, 19)	28m 56s
test_when_cache_present (8, 19)	25m 8s
test_when_cache_present (9, 19)	24m 35s
test_when_cache_present (10, 19)	32m 58s
test_when_cache_present (11, 19)	25m 44s
test_when_cache_present (12, 19)	24m 33s
test_when_cache_present (13, 19)	31m 51s
test_when_cache_present (14, 19)	26m 12s
test_when_cache_present (15, 19)	26m 34s
test_when_cache_present (16, 19)	31m 0s
test_when_cache_present (17, 19)	25m 39s
test_when_cache_present (18, 19)	29m 39s
test_when_cache_present (19, 19)	17m 43s
test_when_cache_missing	0s
save_test_times_when_cache_missing	0s
save_test_times_when_cache_present	8s
	9h 25m 30s

Provide feedback