Fixed bugs 760475, 953599, and 1519. This is a translation of changelist 64768

to the py3k branch.