Merge branch 'MDL-69269-310' of git://github.com/sarjona/moodle into MOODLE_310_STABLE
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 31 Aug 2020 04:41:30 +0000 (12:41 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 31 Aug 2020 23:28:27 +0000 (07:28 +0800)

Trivial merge