Add missing ORDER BY timestamp to grouped queries
Merge branch 'master' into master-travis