Merge branch 'MDL-38003_m22' of https://github.com/markn86/moodle into MOODLE_22_STABLE