Merge branch 'MDL-64151-master-fix' of https://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 24 Apr 2019 10:21:38 +0000 (12:21 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 24 Apr 2019 10:21:38 +0000 (12:21 +0200)

Trivial merge