SIGN IN SIGN UP

Merge with 3.2 (Issue #12404).

R
Ross Lagerwall committed
1db37f3248697d0a6fa24cea6b7112651f0e4abb