Merge branch 'MDL-64599' of https://github.com/marcusboon/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Feb 2019 11:50:46 +0000 (12:50 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Feb 2019 11:50:46 +0000 (12:50 +0100)

Trivial merge