Merge branch 'MDL-63396-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 29 Oct 2018 22:35:31 +0000 (23:35 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 29 Oct 2018 22:35:31 +0000 (23:35 +0100)

Trivial merge