Merge branch 'MDL-66061-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 26 Aug 2019 14:29:16 +0000 (16:29 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 26 Aug 2019 14:29:16 +0000 (16:29 +0200)

Trivial merge