SIGN IN SIGN UP

Merge from 3.5.

E
Eric Snow committed
cbdb17f681fffba35a805f832f1b5bf99adcc312