SIGN IN SIGN UP

merge 3.2

B
Benjamin Peterson committed
d3a345a21f4e07469622d148308637f0d5e69cf5