Merge branch 'w28_MDL-28313_m22_enroldb' of git://github.com/skodak/moodle