SIGN IN SIGN UP

Merge from 3.5.

E
Eric Snow committed
3ef8958e4022df5f14a8cfd57dec39e218a0f554