SIGN IN SIGN UP

Merged fixes for two bad bugs. This will be the new Python 3.5.0rc1.

L
Larry Hastings committed
73b4a7a7943026b90b3d04932ffb1efd0d6b107e