Merge branch 'MDL-65218-master' of git://github.com/damyon/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Mon, 8 Apr 2019 08:53:43 +0000 (16:53 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Mon, 8 Apr 2019 08:53:43 +0000 (16:53 +0800)

Trivial merge