Merge branch 'MDL-46671-27' of https://github.com/pjking07/moodle into MOODLE_27_STABLE