Merge branch 'MDL-62037-master' of https://github.com/lethevinh/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 9 Jul 2018 11:48:47 +0000 (13:48 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 9 Jul 2018 11:48:47 +0000 (13:48 +0200)

Trivial merge