set longer timeout for cocoa webkit requests
Merge branch 'master' of github.com:/rstudio/rstudio