SIGN IN SIGN UP

merge 3.2

B
Benjamin Peterson committed
dc37ce95e8979d5d9e9c0777910bf94080d29115