More on clustering
Merge branch 'master' into gh-pages
Up to date