Merge branch 'MDL-69311-39' of https://github.com/paulholden/moodle into MOODLE_39_STABLE
authorAdrian Greeve <abgreeve@gmail.com>
Thu, 6 Aug 2020 01:49:32 +0000 (09:49 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Thu, 6 Aug 2020 01:49:32 +0000 (09:49 +0800)

Trivial merge