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