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