Added responseTimeout
Merge branch 'master' into hooks