Stats sorting fix.
Merge branch 'development'