Merge branch 'MDL-69687-m310' of https://github.com/sammarshallou/moodle into MOODLE_...
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 19 Oct 2020 05:19:28 +0000 (13:19 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 19 Oct 2020 05:19:28 +0000 (13:19 +0800)

Trivial merge