Merge branch 'MDL-34248_m27' of https://github.com/markn86/moodle into MOODLE_27_STABLE