SIGN IN SIGN UP

merge 3.4

B
Benjamin Peterson committed
e22735036bd749dea3eba340cb077b82d7b35b86