Merge branch 'MDL-68378-master' of git://github.com/rezaies/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 29 Apr 2020 00:19:09 +0000 (08:19 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 29 Apr 2020 00:19:09 +0000 (08:19 +0800)

Trivial merge