SIGN IN SIGN UP

merge 3.4 (#21295)

B
Benjamin Peterson committed
f86d1fdab79cd6cab150fffecbc76388cb5b7f92