SIGN IN SIGN UP

merge 3.2

B
Benjamin Peterson committed
99e6f87586cd11d0d881891851c831a8d7ebb902