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