Account for normalization when sorting reports
Merge branch 'master' into gh-pages