Merge branch 'MDL-64383-master' of git://github.com/damyon/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Jun 2019 21:02:41 +0000 (23:02 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Jun 2019 21:02:41 +0000 (23:02 +0200)

Trivial merge