Merge branch 'MDL-68826-master' of git://github.com/ferranrecio/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Fri, 5 Jun 2020 07:24:26 +0000 (15:24 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Fri, 5 Jun 2020 07:24:26 +0000 (15:24 +0800)

Trivial merge