Merge pull request #1492 from gem/source-ordering

Source ordering
Merge branch 'master' into parallel-filtering