Merge branch 'MDL-40227-39-1' of git://github.com/peterRd/moodle into MOODLE_39_STABLE
authorAdrian Greeve <abgreeve@gmail.com>
Thu, 6 Aug 2020 03:28:34 +0000 (11:28 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Thu, 6 Aug 2020 03:28:34 +0000 (11:28 +0800)

Trivial merge