fix sort order in activity report
Merge branch 'master' into integration