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