SIGN IN SIGN UP

Merge from 3.5 to default.

L
Larry Hastings committed
0c477e6a8580056efaee07c15528edb7d037ce61