Merge branch 'MDL-68683-39' of git://github.com/lameze/moodle into MOODLE_39_STABLE
authorAdrian Greeve <abgreeve@gmail.com>
Wed, 19 Aug 2020 04:57:04 +0000 (12:57 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Wed, 19 Aug 2020 04:57:04 +0000 (12:57 +0800)

Trivial merge