Merge r68708 to py3k, fixes 4449
4 files changed