Merge branch 'MDL-67047-master' of git://github.com/jleyva/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Tue, 5 Nov 2019 05:09:06 +0000 (13:09 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Tue, 5 Nov 2019 05:09:06 +0000 (13:09 +0800)

Trivial merge