Merge branch 'MDL-64469-master' of https://github.com/lethevinh/moodle