Merge branch 'MDL-70167-310' of git://github.com/andrewnicols/moodle into MOODLE_310_...
authorAdrian Greeve <abgreeve@gmail.com>
Thu, 3 Dec 2020 01:57:42 +0000 (09:57 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Thu, 3 Dec 2020 01:57:42 +0000 (09:57 +0800)

Trivial merge