SIGN IN SIGN UP

merge 3.2 (#9574)

M
Mark Dickinson committed
c7ceb2bc951b9e69d2bb148c80014dce080c431a