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