Merge branch 'wip_MDL-70267_m310' of git://github.com/gjb2048/moodle into MOODLE_310_...
authorAdrian Greeve <abgreeve@gmail.com>
Thu, 3 Dec 2020 02:56:37 +0000 (10:56 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Thu, 3 Dec 2020 02:56:37 +0000 (10:56 +0800)

Trivial merge