Merge branch 'MDL-64439-master' of https://github.com/ilya-catalyst/moodle