Merge branch 'MDL-64653-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Mar 2019 22:03:02 +0000 (23:03 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Mar 2019 22:03:02 +0000 (23:03 +0100)

Trivial merge