Merge branch 'MDL-52708' of https://github.com/ramdesh/moodle