Merge branch 'gh-pages'
Order by fixed on mysql
Merge branch 'master' into gh-pages