Merge branch 'MDL-60025-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Sep 2017 21:50:36 +0000 (23:50 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Sep 2017 21:50:36 +0000 (23:50 +0200)

Trivial merge