SIGN IN SIGN UP

Merge in 3.4 to bring forward the Issue #21043 changes.

D
Donald Stufft committed
eaeb955f4818896bd552770d55affabeab066836