Merge branch 'MDL-50637' of git://github.com/sk-unikent/moodle