Merge branch 'MDL-65876-master' of https://github.com/lucaboesch/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 30 Sep 2019 22:07:30 +0000 (00:07 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 30 Sep 2019 22:07:30 +0000 (00:07 +0200)

Trivial merge