Merging PickCourses to Master

Done by hand.
Trying to squash a bug in the header