Merge branch 'MDL-59836-master' of git://github.com/junpataleta/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 18 Aug 2017 10:36:17 +0000 (12:36 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 18 Aug 2017 10:36:17 +0000 (12:36 +0200)

Trivial merge