Merge branch 'MDL-69143-master' of git://github.com/ferranrecio/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 11 Aug 2020 06:33:44 +0000 (14:33 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 11 Aug 2020 06:33:44 +0000 (14:33 +0800)

Trivial merge