Avoid erroneous timeouts caused by slow VMs
Merge branch 'master' into geezer