Merge branch 'MDL-63746-master' of git://github.com/damyon/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 1 Nov 2018 14:38:08 +0000 (15:38 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 1 Nov 2018 14:38:08 +0000 (15:38 +0100)

Trivial merge