SIGN IN SIGN UP

merge 3.2

B
Benjamin Peterson committed
ecb3bd93ff9508a4ec0b705b3778b04a0590e5e7