Merge branch 'MDL-64324-master-fix' of https://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 23 Jan 2019 22:12:47 +0000 (23:12 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 23 Jan 2019 22:12:47 +0000 (23:12 +0100)

Trivial merge