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