Merge branch 'MDL-64322' of https://github.com/KietChan/moodle