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