SIGN IN SIGN UP

Forward-merge from 3.4 to 3.5.

L
Larry Hastings committed
f5b1af6df559f1c29211701f21bd181eab6a5b60