Merge branch 'w35_MDL-35061_m24_enrolfields' of git://github.com/skodak/moodle