Merge branch 'MDL-70327-master' of git://github.com/cescobedo/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 3 Dec 2020 03:49:35 +0000 (11:49 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 3 Dec 2020 03:49:35 +0000 (11:49 +0800)

Trivial merge