SIGN IN SIGN UP

Merge from 3.5.

E
Eric Snow committed
d14de5e22d6bb24740a7db5e0e85fb7a2c43b51b