[2.7] bpo-13096: Fix partial backport of issue 13096.#12100

vstinner merged 2 commits into

python:2.7python/cpython:2.7from

stratakis:bpo13096stratakis/cpython:bpo13096Copy head branch name to clipboard