Merge branch 'MDL-69109-master-2' of git://github.com/marinaglancy/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 8 Jul 2020 00:39:32 +0000 (08:39 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 8 Jul 2020 00:39:32 +0000 (08:39 +0800)

Trivial merge