SIGN IN SIGN UP

Merge 3.4

D
Donald Stufft committed
ef330d35c8223157cf2d395915efbdce41a3173f