Merge branch 'MOODLE_310_MDL-47178' of https://github.com/golenkovm/moodle into MOODL...