merge r68915 to py3k
5 files changed