SIGN IN SIGN UP

merge 3.4 (#25245)

B
Benjamin Peterson committed
bdb93c3e638a1b8191d68052b3cea2a0475bc530