Merge branch 'MDL-65144-master' of git://github.com/damyon/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Tue, 2 Apr 2019 02:15:18 +0000 (10:15 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Tue, 2 Apr 2019 02:15:18 +0000 (10:15 +0800)

Trivial merge