SIGN IN SIGN UP

merge 3.4

B
Benjamin Peterson committed
da30b46e571d0e8f4ca6a7205b6f202de67f0c02