Merge branch 'MDL-70242-310' of git://github.com/marinaglancy/moodle into MOODLE_310_...
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 26 Nov 2020 02:49:19 +0000 (10:49 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 26 Nov 2020 11:54:26 +0000 (12:54 +0100)

Trivial merge