Merge branch 'w15_MDL-32263_m23_enroladmin' of git://github.com/skodak/moodle