Reduce tiles to 1 and 3
Merge branch 'master' into gh-pages