merge r68768 to py3k
4 files changed