More preloading on front page
Merge branch 'master' into gh-pages