SIGN IN SIGN UP

Merge from 3.5.

L
Larry Hastings committed
5d37d6390334187f450e372b62ec0a9c9ba1dc84