Merge branch 'clones' into gh-pages