SIGN IN SIGN UP

merge 3.2

B
Benjamin Peterson committed
d79ac0fad7d125d081194981e8bd17b1528a8bfc