Merge branch 'MDL-65399-master' of git://github.com/rezaies/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 6 May 2019 08:26:42 +0000 (16:26 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Tue, 7 May 2019 08:24:38 +0000 (16:24 +0800)

Trivial merge