Merge branch 'MDL-66593-master' of git://github.com/cescobedo/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 30 Oct 2019 10:19:40 +0000 (11:19 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 30 Oct 2019 10:19:40 +0000 (11:19 +0100)

Trivial merge