Merge branch 'MDL-62334-master' of https://github.com/danielneis/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 25 Sep 2018 20:50:41 +0000 (22:50 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 25 Sep 2018 20:50:41 +0000 (22:50 +0200)

Trivial merge