merge develop with master - general entry requirements

this will allow a rollout to live of the general entry requirements bug on UG courses