Merge branch 'MDL-69475' of https://github.com/stronk7/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Wed, 19 Aug 2020 02:37:51 +0000 (10:37 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Wed, 19 Aug 2020 02:37:51 +0000 (10:37 +0800)

Trivial merge