Merge branch 'MDL-66133-master' of git://github.com/abias/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 28 Aug 2019 15:38:25 +0000 (17:38 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 28 Aug 2019 15:38:25 +0000 (17:38 +0200)

Trivial merge