Merge branch 'MDL-40227-master-1' of git://github.com/peterRd/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Thu, 6 Aug 2020 03:25:58 +0000 (11:25 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Thu, 6 Aug 2020 03:25:58 +0000 (11:25 +0800)

Trivial merge