Merge branch 'MDL-68683-master' of git://github.com/lameze/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Wed, 19 Aug 2020 04:51:23 +0000 (12:51 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Wed, 19 Aug 2020 04:51:23 +0000 (12:51 +0800)

Trivial merge