increase timeout for long lived connections
Merge branch 'master' into private