Merge branch 'MDL-64479' of https://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 9 Jan 2019 22:33:36 +0000 (23:33 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 9 Jan 2019 22:33:36 +0000 (23:33 +0100)

Trivial merge