bpo-29596: Back-port patch to Python 3.5#1975

Mariatta merged 1 commit intopython:3.5python/cpython:3.5from

gfyoung:3.5-backport-issue-29596Copy head branch name to clipboard