Merge branch 'MDL-59242-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Oct 2017 20:59:38 +0000 (22:59 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Oct 2017 20:59:38 +0000 (22:59 +0200)

Trivial merge