Merge branch 'w24_MDL-33204_m23_importsort' of git://github.com/skodak/moodle