Merge branch 'MDL-62814-master' of https://github.com/HuongNV13/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 10 Jul 2018 05:50:45 +0000 (07:50 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 10 Jul 2018 05:50:45 +0000 (07:50 +0200)

Trivial merge