Cherry pick bpo-25008 to 3.5#279

warsaw merged 1 commit into

python:3.5python/cpython:3.5from

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