Merge branch 'MDL-63225-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 10 Oct 2018 21:24:27 +0000 (23:24 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 10 Oct 2018 21:24:27 +0000 (23:24 +0200)

Trivial merge