SIGN IN SIGN UP

Merge from 3.5.

E
Eric Snow committed
7a3414c20118743347bcabb6c8d3fe5ee75cd0fa