Merge branch 'MDL-36088-master' of https://github.com/lethevinh/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Mon, 29 Apr 2019 06:12:53 +0000 (14:12 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Mon, 29 Apr 2019 06:12:53 +0000 (14:12 +0800)

Trivial merge