Merge branch 'MDL-68883-master' of git://github.com/andrewnicols/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Wed, 3 Jun 2020 00:38:33 +0000 (08:38 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Wed, 3 Jun 2020 00:38:33 +0000 (08:38 +0800)

Trivial merge