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