Merge branch 'w36_MDL-29306_m22_dbenrolroles' of git://github.com/skodak/moodle