Merge branch 'MDL-67436-master' of https://github.com/jondo/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Tue, 21 Jul 2020 00:28:53 +0000 (08:28 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Tue, 21 Jul 2020 00:28:53 +0000 (08:28 +0800)

Trivial merge