Merge branch 'MDL-67153' of https://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 7 Nov 2019 18:49:42 +0000 (19:49 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 7 Nov 2019 18:49:42 +0000 (19:49 +0100)

Trivial merge