merge 66184 to fix issue3110 to py3k
2 files changed