SIGN IN SIGN UP

merge 3.4

B
Benjamin Peterson committed
76c95a01dceb538b350de8ae70c3690cf0ca7d61