handle new "course type" N in various places
Merge commit 'github/testing' into beta