Merge branch 'MDL-69301-310' of git://github.com/rezaies/moodle into MOODLE_310_STABLE
authorAdrian Greeve <abgreeve@gmail.com>
Mon, 7 Dec 2020 01:29:24 +0000 (09:29 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Mon, 7 Dec 2020 01:29:24 +0000 (09:29 +0800)

Trivial merge