Merge branch 'MDL-68985-master' of git://github.com/sarjona/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Wed, 10 Jun 2020 01:39:45 +0000 (09:39 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Wed, 10 Jun 2020 01:39:45 +0000 (09:39 +0800)

Trivial merge