Fix orderby lost in merge
Merge pull request #122 from humanmade/fix-fix-orderby

Fix orderby lost in merge
Merge branch 'refs/heads/master' into MP6