Merge branch 'MDL-80220-main' of https://github.com/laurentdavid/moodle