SIGN IN SIGN UP

merge 3.2

B
Benjamin Peterson committed
df13b5fae13f0a4aa9689d0873bc433960129a0c