Merge branch 'MDL-66980' of https://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Oct 2019 18:26:34 +0000 (20:26 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Oct 2019 18:26:34 +0000 (20:26 +0200)

Trivial merge