SIGN IN SIGN UP

merge 3.4 (#21355)

B
Benjamin Peterson committed
5e746f237354f9fe345743616c40b96229910590