SIGN IN SIGN UP

merge 3.4 (#21766)

B
Benjamin Peterson committed
ff180af0572ce64ea7b4bb99957cf0c216adce36