Merge branch 'MDL-63884-master-fix' of https://github.com/snake/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 9 Nov 2018 10:19:02 +0000 (11:19 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 9 Nov 2018 10:19:02 +0000 (11:19 +0100)

Trivial merge