SIGN IN SIGN UP

merge 3.4 (#25471)

B
Benjamin Peterson committed
2775d85d55a092e3aca9a72bf2e5328d95b0340f