Merge branch 'MDL-57682-310' of git://github.com/rezaies/moodle into MOODLE_310_STABLE
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 9 Sep 2020 04:23:33 +0000 (12:23 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 9 Sep 2020 04:23:33 +0000 (12:23 +0800)

Trivial merge