Merge branch 'MDL-29817' of https://github.com/rushi963/moodle