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

Trivial merge