merge r68839 forward to py3k
2 files changed