SIGN IN SIGN UP

Merge with ongoing work in 3.5 branch.

L
Larry Hastings committed
ab30353adbef3a3fdd54fb30856af8ff94f2c108