Merge branch 'MDL-62395-master' of git://github.com/junpataleta/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Oct 2018 21:06:28 +0000 (23:06 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Oct 2018 21:06:28 +0000 (23:06 +0200)

Trivial merge