Merge branch 'MDL-53139' of https://github.com/dg711/moodle