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