Merge branch 'MDL-36104_m23' of https://github.com/markn86/moodle into MOODLE_23_STABLE