Add longer timeout for resource loading
Merge remote-tracking branch 'origin/master' into gh-pages