Merge branch 'MDL-67613-master' of git://github.com/ferranrecio/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Thu, 7 May 2020 00:40:41 +0000 (08:40 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Thu, 7 May 2020 00:40:41 +0000 (08:40 +0800)

Trivial merge