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