Merge branch 'MDL-64031-master' of https://github.com/lethevinh/moodle
authorSara Arjona <sara@moodle.com>
Mon, 11 Feb 2019 11:33:06 +0000 (12:33 +0100)
committerSara Arjona <sara@moodle.com>
Mon, 11 Feb 2019 11:33:06 +0000 (12:33 +0100)

Trivial merge