Merge branch 'w35_MDL-35064_m24_delenrol' of git://github.com/skodak/moodle