* commit 'ad716e42e89cc5fe92c3ff86ec2714c416d522aa': Fix bug 17931760 - spurious timeout leads to mayhem