Fixing bug with criteria re-ordering.
Merge branch 'master' into release