SIGN IN SIGN UP

merge 3.4

B
Benjamin Peterson committed
f01c782960f1e4bafa35f908ab3b203db4537253