Merge branch 'MDL-66332-master' of git://github.com/ferranrecio/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 18 Dec 2019 16:53:00 +0000 (17:53 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 18 Dec 2019 16:53:00 +0000 (17:53 +0100)

Trivial merge