Fixed re-ordering of criteria.
Merge branch 'master' into release