Merge pull request #3246 from bavison/faster_sorting_step2