Merge branch 'MDL-68662' of https://github.com/Chocolate-lightning/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Wed, 20 May 2020 08:52:17 +0000 (16:52 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Wed, 20 May 2020 08:52:17 +0000 (16:52 +0800)

Trivial merge