Merge branch 'MDL-53346-master' of git://github.com/damyon/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 Feb 2019 23:23:21 +0000 (00:23 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 Feb 2019 23:23:21 +0000 (00:23 +0100)

Trivial merge