Merge branch 'MDL-60779-master' of git://github.com/junpataleta/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sat, 11 Nov 2017 12:03:54 +0000 (13:03 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sat, 11 Nov 2017 12:03:54 +0000 (13:03 +0100)

Trivial merge