collates the data in an overlay
Merge branch 'master' into gh-pages