SIGN IN SIGN UP

merge 3.4 (#24883)

B
Benjamin Peterson committed
8e205f7b4f852d903db223d98b96721c4bc19644