[3.7] bpo-34576 : Backport eeab510#10114

orsenthil merged 3 commits into

3.7python/cpython:3.7from

backport-eeab510-3.7python/cpython:backport-eeab510-3.7Copy head branch name to clipboard