Merge branch 'MDL-65025-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 16 Sep 2019 22:01:51 +0000 (00:01 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 16 Sep 2019 22:01:51 +0000 (00:01 +0200)

Trivial merge