SIGN IN SIGN UP

merge 3.4 (#25371)

B
Benjamin Peterson committed
e5df40727c3bb24dbf38b74a6c1e0e2a6b70b429