Merge branch 'MDL-81413-main' of https://github.com/lameze/moodle