SIGN IN SIGN UP

merge 3.4 (#23364, #23363)

B
Benjamin Peterson committed
5d0bb852a25d010cc1aacf661d26a6bae1c8bf1a