SIGN IN SIGN UP

merge 3.6 (#26617)

B
Benjamin Peterson committed
b983b8de9db24671db1212e11c254839b965b23e