Merge branch 'MDL-61402' of https://github.com/mkassaei/moodle