Merge branch 'MDL-69739-master' of https://github.com/clransom/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 15 Oct 2020 05:16:32 +0000 (13:16 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 15 Oct 2020 05:16:32 +0000 (13:16 +0800)

Trivial merge