Merge branch 'MDL-44095' of https://github.com/shashirepo/moodle