Merge branch 'w24_MDL-33636_m23_yuislash' of git://github.com/skodak/moodle