Merge branch 'MDL-65572-master' of git://github.com/damyon/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Tue, 21 May 2019 07:19:29 +0000 (15:19 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Tue, 21 May 2019 07:19:29 +0000 (15:19 +0800)

Trivial merge