Merge branch 'MDL-69687-m310' of https://github.com/sammarshallou/moodle into MOODLE_...
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 20 Oct 2020 00:02:22 +0000 (08:02 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 20 Oct 2020 00:02:22 +0000 (08:02 +0800)

Trivial merge