SIGN IN SIGN UP

Issue #20220: Merge time zone workaround from 3.4 into 3.5

M
Martin Panter committed
42347100bff765db08661f9f623d85e2873b067a