Merge branch 'MDL-37539-24' of github.com:damyon/moodle into MOODLE_24_STABLE