Merge branch 'MDL-61326-master' of git://github.com/peterRd/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Feb 2019 23:19:07 +0000 (00:19 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Feb 2019 23:19:07 +0000 (00:19 +0100)

Trivial merge