SIGN IN SIGN UP

merge 3.2

B
Benjamin Peterson committed
84e821e961b5f0ea288f7f200902c24ec4f523bc