SIGN IN SIGN UP

merge 3.2

B
Benjamin Peterson committed
3331a20464d7018e8e0b0f7710690dd1575be3b6