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