Don't filter out groups that expired yesterday, it stops us seeing results from last semester.
Merge remote-tracking branch 'origin/3.9.2-bugfixes' into 3.9.2-bugfixes