Merge branch 'MDL-69458-master' of git://github.com/mihailges/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 27 Aug 2020 04:42:31 +0000 (12:42 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 27 Aug 2020 04:42:31 +0000 (12:42 +0800)

Trivial merge