Merge branch 'MDL-64606-master' of https://github.com/lucaboesch/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Feb 2019 23:02:12 +0000 (00:02 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Feb 2019 23:02:12 +0000 (00:02 +0100)

Trivial merge