Merge branch 'MDL-79368-main' of https://github.com/roland04/moodle