Merge branch 'MDL-68921-39' of git://github.com/vmdef/moodle into MOODLE_39_STABLE
authorAdrian Greeve <abgreeve@gmail.com>
Tue, 25 Aug 2020 02:37:58 +0000 (10:37 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Tue, 25 Aug 2020 02:37:58 +0000 (10:37 +0800)

Trivial merge