Merge branch 'MDL-63255-master' of git://github.com/vmdef/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Sep 2018 21:31:00 +0000 (23:31 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Sep 2018 21:31:00 +0000 (23:31 +0200)

Trivial merge