A better fix for test break against new user_stats.
Merge branch 'finished' of github.com:code-dot-org/dashboard into finished