Merge branch 'wip-MDL-61876-fix' of https://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 7 May 2018 17:15:28 +0000 (19:15 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 7 May 2018 17:15:28 +0000 (19:15 +0200)

Trivial merge