Merge branch 'MDL-65215-master' of git://github.com/peterRd/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 26 Nov 2020 03:50:22 +0000 (11:50 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 26 Nov 2020 11:46:11 +0000 (12:46 +0100)

Trivial merge