Issue #20387: Backport fix from Python 3.4
2 files changed