Merge pull request #83 from barrysspace/expired_self_enrolments_MDL26