Merge branch 'MDL-52840_master' of https://github.com/rezaies/moodle