Merge branch 'MDL-69311' of https://github.com/paulholden/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Thu, 6 Aug 2020 01:47:48 +0000 (09:47 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Thu, 6 Aug 2020 01:47:48 +0000 (09:47 +0800)

Trivial merge