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