Merge branch 'MDL-61827' of git://github.com/lszeremeta/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 20 Apr 2018 00:32:26 +0000 (02:32 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 20 Apr 2018 00:32:26 +0000 (02:32 +0200)

Trivial merge