Merge branch 'MDL-63371' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Sep 2018 21:09:20 +0000 (23:09 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Sep 2018 21:09:20 +0000 (23:09 +0200)

Trivial merge