Merge branch 'master-MDL-70362' of https://github.com/golenkovm/moodle