Merge branch 'MDL-62319-master' of git://github.com/damyon/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Oct 2018 21:54:51 +0000 (23:54 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Oct 2018 21:54:51 +0000 (23:54 +0200)

Trivial merge