Merge branch 'MDL-63765-master' of git://github.com/damyon/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 26 Oct 2018 08:21:43 +0000 (10:21 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 26 Oct 2018 08:21:43 +0000 (10:21 +0200)

Trivial merge