SIGN IN SIGN UP

merge 3.4

B
Benjamin Peterson committed
4fa49727d7e50b7f93c1861a4520d6654e1808c9