Merge branch 'MDL-69077' of https://github.com/timhunt/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Mon, 22 Jun 2020 02:32:44 +0000 (10:32 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Mon, 22 Jun 2020 02:32:44 +0000 (10:32 +0800)

Trivial merge