Merge branch 'MDL-54035_master-fix' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 26 Sep 2018 21:28:34 +0000 (23:28 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 26 Sep 2018 21:28:34 +0000 (23:28 +0200)

Trivial merge