Merge branch 'MDL-61766-master' of git://github.com/junpataleta/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Apr 2018 23:18:20 +0000 (01:18 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Apr 2018 23:18:20 +0000 (01:18 +0200)

Trivial merge