Merge branch 'MDL-68423-master' of git://github.com/ferranrecio/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Thu, 13 Aug 2020 03:02:04 +0000 (11:02 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Thu, 13 Aug 2020 03:02:04 +0000 (11:02 +0800)

Trivial merge