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