Merge branch 'MDL-68932-master' of git://github.com/rezaies/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 13 Aug 2020 02:51:59 +0000 (10:51 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 13 Aug 2020 02:51:59 +0000 (10:51 +0800)

Trivial merge