Merge branch 'MDL-56119-DEV' of https://github.com/inigozendegi/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 23 Dec 2020 00:23:13 +0000 (01:23 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 23 Dec 2020 00:23:13 +0000 (01:23 +0100)

Trivial merge