Merge branch 'w42_MDL-29688_m22_enrol' of git://github.com/skodak/moodle