SIGN IN SIGN UP

Merge from 3.5.

E
Eric Snow committed
d8e5d6c4a5c0be047e3b7c53f5954bd3a3a34af6