Merge branch 'MDL-59294-master' of git://github.com/junpataleta/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Jul 2017 07:42:41 +0000 (09:42 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Jul 2017 07:42:41 +0000 (09:42 +0200)

Trivial merge