Merge branch 'w50_MDL-30528_m23_enrolroleid' of git://github.com/skodak/moodle