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