Merge branch 'MDL-70153-310' of git://github.com/dpalou/moodle into MOODLE_310_STABLE
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 26 Nov 2020 03:27:14 +0000 (11:27 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 26 Nov 2020 11:54:26 +0000 (12:54 +0100)

Trivial merge