Merge branch 'MDL-67701-master' of git://github.com/ferranrecio/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Apr 2020 15:36:49 +0000 (17:36 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Apr 2020 15:36:49 +0000 (17:36 +0200)

Trivial merge