SIGN IN SIGN UP

merge 3.5

B
Benjamin Peterson committed
5b8854eee0d81fdc56e38a1356fd4a0972d231bc