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

Trivial merge