Merge branch 'MDL-65326-master' of https://github.com/dmitriim/moodle