Merge branch 'MDL-66818-master' of git://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 20 Aug 2020 00:16:07 +0000 (08:16 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 20 Aug 2020 00:16:07 +0000 (08:16 +0800)

Trivial merge