Merge branch 'MDL-74184' of https://github.com/timhunt/moodle