Merge branch 'MDL-59227' of https://github.com/rlorenzo/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Sep 2018 21:11:34 +0000 (23:11 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Sep 2018 21:11:34 +0000 (23:11 +0200)

Trivial merge