fixes accidental delete of sorter
Merge branch 'master' into gh-pages