SIGN IN SIGN UP

Issue #15853: merge 3.2 -> 3.3

N
Ned Deily committed
b6d24d97467d2b4b74017c4812f7173f8021ece3