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