Merge branch 'MDL-10971_cloze_shuffle_fix' of git://github.com/timhunt/moodle