Merge branch 'MDL-69798_310' of https://github.com/timhunt/moodle into MOODLE_310_STABLE
authorAdrian Greeve <abgreeve@gmail.com>
Thu, 8 Oct 2020 05:34:30 +0000 (13:34 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Thu, 8 Oct 2020 05:34:30 +0000 (13:34 +0800)

Trivial merge