SIGN IN SIGN UP

merge 3.4 (#19996)

B
Benjamin Peterson committed
60a2f49c8cfeb632d38c7ffb8db622049e760a54