Merge branch 'MDL-42434-39' of git://github.com/sarjona/moodle into MOODLE_39_STABLE
authorAdrian Greeve <abgreeve@gmail.com>
Thu, 20 Aug 2020 03:24:43 +0000 (11:24 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Thu, 20 Aug 2020 03:24:43 +0000 (11:24 +0800)

Trivial merge