Merge branch 'MDL-61244-master-fix' of git://github.com/junpataleta/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Jul 2018 08:36:30 +0000 (10:36 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Jul 2018 08:36:30 +0000 (10:36 +0200)

Trivial merge