merge r68862 to py3k
1 file changed