Merge branch 'wip-MDL-62411-master' of https://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 25 Oct 2018 10:23:53 +0000 (12:23 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 25 Oct 2018 10:23:53 +0000 (12:23 +0200)

Trivial merge