SIGN IN SIGN UP

merge 3.4 (#21642)

B
Benjamin Peterson committed
3e439797bad59948ff810aeaf7e992b23451ddd6