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