Merge branch 'MDL-42476' of https://github.com/srynot4sale/moodle