Explicit timeouts for all ajax calls
Merge branch 'master' into gh-pages