SIGN IN SIGN UP

merge 3.2 (#21766)

B
Benjamin Peterson committed
6cd1954c5cff4b3722a183d13648c71b18259778