Merge branch 'master_MDL-66864' of https://github.com/golenkovm/moodle