Merge branch 'MDL-69473-master' of git://github.com/sarjona/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 19 Aug 2020 23:39:22 +0000 (07:39 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 19 Aug 2020 23:39:22 +0000 (07:39 +0800)

Trivial merge