SIGN IN SIGN UP

Forward-merge from 3.4.

L
Larry Hastings committed
d9cb1b0c2d25ac1e368580a14803847688183518