Make free electives work
Merge remote-tracking branch 'origin/Caroline' into dev