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