Merge branch 'MDL-31262_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE