Merge branch 'MDL-68196-master' of git://github.com/rezaies/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Thu, 16 Apr 2020 02:55:11 +0000 (10:55 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Thu, 16 Apr 2020 02:55:11 +0000 (10:55 +0800)

Trivial merge