Merge branch 'MDL-66307' of https://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 5 Aug 2019 11:30:46 +0000 (13:30 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 5 Aug 2019 11:30:46 +0000 (13:30 +0200)

Trivial merge