SIGN IN SIGN UP

merge 3.2

B
Benjamin Peterson committed
e518d4c18a760a153fb381b38fe022b3c1b36096