Merge branch 'MDL-69464' of https://github.com/marinaglancy/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 25 Aug 2020 04:39:48 +0000 (12:39 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 25 Aug 2020 04:39:48 +0000 (12:39 +0800)

Trivial merge