Merge branch 'MDL-25988_20_wip_enrolroles' of git://github.com/skodak/moodle