Merge branch 'MDL-67468-Master' of https://github.com/tuanngocnguyen/moodle into...