Merge branch 'MDL-66792' of https://github.com/paulholden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 13 Oct 2019 15:08:31 +0000 (17:08 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 13 Oct 2019 15:08:31 +0000 (17:08 +0200)

Trivial merge