Possible fix for bugzilla 443609
3 hours keep-alive time
Merge branch 'master' into cf-deploy