Merge branch 'MDL-68822-master' of git://github.com/ferranrecio/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Thu, 28 May 2020 03:49:37 +0000 (11:49 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Thu, 28 May 2020 03:49:37 +0000 (11:49 +0800)

Trivial merge