Merge branch 'MDL-63020' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 24 Sep 2018 14:01:21 +0000 (16:01 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 24 Sep 2018 14:01:21 +0000 (16:01 +0200)

Trivial merge