Cherry pick bpo-25008 to 3.4 - #280

Cherry pick bpo-25008 to 3.4#280

warsaw merged 1 commit into

python:3.4python/cpython:3.4from

warsaw:bpo-25008-3.4warsaw/cpython:bpo-25008-3.4Copy head branch name to clipboard