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