Merge branch 'MDL-66563' of https://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 11 Sep 2019 18:10:33 +0000 (20:10 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 11 Sep 2019 18:10:33 +0000 (20:10 +0200)

Trivial merge