Merge branch 'gh-pages' into clones

Conflicts:
index.html