Merge 3.5 (test_coroutines, issue #25367)