Merge branch 'MDL-70265_310' of https://github.com/stronk7/moodle into MOODLE_310_STABLE
authorSara Arjona <sara@moodle.com>
Wed, 25 Nov 2020 14:46:50 +0000 (15:46 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 26 Nov 2020 11:54:25 +0000 (12:54 +0100)

Trivial merge