SIGN IN SIGN UP

merge 3.4

B
Benjamin Peterson committed
e380e0986bcec1eff78655d559774d71417b799d