SIGN IN SIGN UP

merge 3.2

B
Benjamin Peterson committed
cbb290af08bc97ace72ca1a5ae19fd7375cae938