Merge branch 'MDL-62577-m' of https://github.com/micaherne/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Jun 2018 22:07:43 +0000 (00:07 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Jun 2018 22:07:43 +0000 (00:07 +0200)

Trivial merge