Exclude courses in subcatgories of hidden top-level categories from total
Merge branch 'master' into no_activity