Merge branch 'MDL-39571-Master' of git://github.com/tuanngocnguyen/moodle