Merge branch 'MDL-49753-master' of https://github.com/alexmitin/moodle