Merge branch 'MDL-69055-39' of git://github.com/sarjona/moodle into MOODLE_39_STABLE
authorAdrian Greeve <abgreeve@gmail.com>
Thu, 20 Aug 2020 04:02:49 +0000 (12:02 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Thu, 20 Aug 2020 04:02:49 +0000 (12:02 +0800)

Trivial merge