Fixing a syntax error in ORDER BY clause.
Merge branch 'trusty'