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