Merge branch 'MDL-63878-master' of git://github.com/damyon/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Tue, 11 Jun 2019 05:30:04 +0000 (13:30 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Tue, 11 Jun 2019 05:30:04 +0000 (13:30 +0800)

Trivial merge