SIGN IN SIGN UP

merge 3.2

B
Benjamin Peterson committed
1a5097244aa1dc40bd278b26285e8d9d01bc0876