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