SIGN IN SIGN UP

Merge from 3.2.

E
Eric V. Smith committed
313fbe21068038099cc4e57ae4bcd9e8a06e8b43