Merge branch 'MDL-61525-master' of https://github.com/HuongNV13/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Apr 2018 22:41:49 +0000 (00:41 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Apr 2018 22:41:49 +0000 (00:41 +0200)

Trivial merge