Merge branch 'MDL-63109-master' of git://github.com/mihailges/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Sep 2018 15:50:13 +0000 (17:50 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Sep 2018 15:50:13 +0000 (17:50 +0200)

Trivial merge