Merge branch 'MDL-69089-master' of git://github.com/aanabit/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 19 Aug 2020 00:18:16 +0000 (08:18 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 19 Aug 2020 00:18:16 +0000 (08:18 +0800)

Trivial merge