Merge branch 'MDL-37181_m24' of https://github.com/markn86/moodle into MOODLE_24_STABLE