Merge branch 'MDL-59756-master-2' of git://github.com/junpataleta/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Aug 2017 11:38:01 +0000 (13:38 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Aug 2017 11:38:01 +0000 (13:38 +0200)

Trivial merge