Merge branch 'MDL-46542' of https://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Feb 2020 08:32:32 +0000 (09:32 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Feb 2020 08:32:32 +0000 (09:32 +0100)

Trivial merge