Merge branch 'w03_MDL-37257_m25_enrolsettings' of git://github.com/skodak/moodle