[3.6] bpo-29854 Backport for 3.6#2633

berkerpeksag merged 2 commits into

python:3.6python/cpython:3.6from

nirs:bpo-29854-3.6nirs/cpython:bpo-29854-3.6Copy head branch name to clipboard