merge cl r68737 to py3k
3 files changed