Merge branch 'MDL-24408_2' of https://github.com/oasychev/moodle