Merge branch 'MDL-62838' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Jul 2018 22:49:23 +0000 (00:49 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Jul 2018 22:49:23 +0000 (00:49 +0200)

Trivial merge