SIGN IN SIGN UP

Issue #25940: Merge ETIMEDOUT fix from 3.3 into 3.4

M
Martin Panter committed
3f2240ccb6841576fe2366c71fb8b3b1569906f5