Merge branch 'MDL-69807-310' of https://github.com/paulholden/moodle into MOODLE_310_...
authorAdrian Greeve <abgreeve@gmail.com>
Wed, 21 Oct 2020 06:18:02 +0000 (14:18 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Wed, 21 Oct 2020 06:18:02 +0000 (14:18 +0800)

Trivial merge