Accurate semester stats for Trend Tracker
Merge branch 'master' into reports_status