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