Merge branch 'MDL-69055-master' of git://github.com/sarjona/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Thu, 20 Aug 2020 04:00:51 +0000 (12:00 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Thu, 20 Aug 2020 04:00:51 +0000 (12:00 +0800)

Trivial merge