Merge branch 'w24_MDL-33635_m23_sort' of git://github.com/skodak/moodle