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

Trivial merge