Merge branch 'MDL-50280' of https://github.com/sk-unikent/moodle