Merge branch 'MDL-65743-310' of git://github.com/lameze/moodle into MOODLE_310_STABLE
authorAdrian Greeve <abgreeve@gmail.com>
Mon, 12 Oct 2020 05:41:44 +0000 (13:41 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Mon, 12 Oct 2020 05:41:44 +0000 (13:41 +0800)

Trivial merge