SIGN IN SIGN UP

merge 3.2

B
Benjamin Peterson committed
61a4161de4075918c1ad5f225498171290454e5d