Merge branch 'MDL-65310-master' of https://github.com/tsmilan/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Sep 2019 22:41:22 +0000 (00:41 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Sep 2019 22:41:22 +0000 (00:41 +0200)

Trivial merge