Merge branch 'master-MDL-53966' of https://github.com/golenkovm/moodle