SIGN IN SIGN UP

Merge 3.2 -> default (issue 13889)

M
Mark Dickinson committed
963816defca26c8817b0185c245f7b30ae365f23