SIGN IN SIGN UP

Issue #24952: Merge 3.5 into 3.6

M
Martin Panter committed
81174d749af8a3da5cbdce2db511f4d71f2fa5ab