Merge branch 'MDL-69113' of https://github.com/jonof/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Mon, 20 Jul 2020 02:20:47 +0000 (10:20 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Mon, 20 Jul 2020 02:20:47 +0000 (10:20 +0800)

Trivial merge