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