Merge branch 'MDL-56653-310' of git://github.com/lameze/moodle into MOODLE_310_STABLE
authorAdrian Greeve <abgreeve@gmail.com>
Thu, 19 Nov 2020 03:10:48 +0000 (11:10 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Thu, 19 Nov 2020 03:10:48 +0000 (11:10 +0800)

Trivial merge