bpo-29615: backport to 3.6 (#478)

3 files changed