Backport rev86422 for issue 10304 from py3k to 31-maint
1 file changed