fix sort-by-teacher-name bug
Merge commit 'github/testing' into beta