SIGN IN SIGN UP

Issue #28485: Merge single-threading fix from 3.5 into 3.6

M
Martin Panter committed
cee93c3b73a115e9f2982b9210be15c417a482dc