Merge branch 'w43_MDL-29984_m22_enroltoday' of git://github.com/skodak/moodle