Merge branch 'MDL-37802' of https://github.com/paulholden/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Wed, 30 Sep 2020 05:52:26 +0000 (13:52 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Wed, 30 Sep 2020 05:52:26 +0000 (13:52 +0800)

Trivial merge