Merge branch 'w46_MDL-36169_m24_enrolsort' of git://github.com/skodak/moodle