Merge branch 'MDL-49803_28' of git://github.com/dmonllao/moodle into MOODLE_28_STABLE