SIGN IN SIGN UP

Merge from 3.4.

L
Larry Hastings committed
e741e4f88e2d65dad1a4ba5dc5a1e3848e909db5