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