Merge branch 'MDL-69079-master-1' of git://github.com/mihailges/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Mon, 27 Jul 2020 00:48:58 +0000 (08:48 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Mon, 27 Jul 2020 00:48:58 +0000 (08:48 +0800)

Trivial merge