[3.7] bpo-33649: More improvements (GH-9439)#9454

miss-islington merged 1 commit intopython:3.7python/cpython:3.7from

miss-islington:backport-e247b46-3.7miss-islington/cpython:backport-e247b46-3.7Copy head branch name to clipboard