Merge branch 'MDL-60132-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Sep 2017 20:34:39 +0000 (22:34 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Sep 2017 20:34:39 +0000 (22:34 +0200)

Trivial merge