Merge branch 'MDL-66378-master' of git://github.com/andrewnicols/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Thu, 22 Aug 2019 01:27:57 +0000 (09:27 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Thu, 22 Aug 2019 01:27:57 +0000 (09:27 +0800)

Trivial merge