[3.5] bpo-29854: Backport to 3.5#2636

berkerpeksag merged 2 commits into

python:3.5python/cpython:3.5from

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