merge r68787 to py3k
1 file changed