Merge branch 'MDL-66378-master' of git://github.com/andrewnicols/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Tue, 20 Aug 2019 05:43:11 +0000 (13:43 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Tue, 20 Aug 2019 05:43:11 +0000 (13:43 +0800)

Trivial merge