SIGN IN SIGN UP

merge 3.2

B
Benjamin Peterson committed
401d197657550f0ac155e96213b328a70724d2fa