Merge branch 'MDL-63303-master' of git://github.com/ryanwyllie/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 15 Nov 2018 10:04:12 +0000 (11:04 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 15 Nov 2018 10:04:12 +0000 (11:04 +0100)

Trivial merge