Merge branch 'MDL-40818-master' of git://github.com/junpataleta/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 26 Jun 2017 23:50:28 +0000 (01:50 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 26 Jun 2017 23:50:28 +0000 (01:50 +0200)

Trivial merge