Merge branch 'MDL-40785_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE