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