Merge branch 'MDL-64864-master' of git://github.com/damyon/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Tue, 5 Mar 2019 06:25:16 +0000 (14:25 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Tue, 5 Mar 2019 06:25:16 +0000 (14:25 +0800)

Trivial merge