merge 70783 to py3k
4 files changed