Merge branch 'MDL-62564-integration-master-1' of git://github.com/mihailges/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 8 Nov 2018 15:38:38 +0000 (16:38 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 8 Nov 2018 15:38:38 +0000 (16:38 +0100)

Trivial merge