Merge branch 'MDL-48916_27' of https://github.com/wesleysitu/moodle into MOODLE_27_STABLE