Merge branch 'MDL-61715-master' of https://github.com/lethevinh/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 26 Apr 2018 20:22:43 +0000 (22:22 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 26 Apr 2018 20:22:43 +0000 (22:22 +0200)

Trivial merge