Merge branch 'MDL-60932-master' of git://github.com/aanabit/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Wed, 5 Aug 2020 02:07:24 +0000 (10:07 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Wed, 5 Aug 2020 02:07:24 +0000 (10:07 +0800)

Trivial merge