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

Trivial merge