Squash before OrderBy (Fixes #264)
Merge pull request #429 from mossprescott/ready/264

Squash before OrderBy (Fixes #264)