SIGN IN SIGN UP

merge 3.4

B
Benjamin Peterson committed
9dd25dd693c31548a91b959052e1ee062516874e