Merge branch 'MDL-68239' of https://github.com/NinaHerrmann/moodle