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

Trivial merge