Merge branch 'MDL-67631' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 15 Jan 2020 23:29:09 +0000 (00:29 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 15 Jan 2020 23:29:09 +0000 (00:29 +0100)

Trivial merge