Merge branch 'MDL-57244-master-text' of git://github.com/abgreeve/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 2 Aug 2018 17:16:58 +0000 (19:16 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 2 Aug 2018 17:16:58 +0000 (19:16 +0200)

Trivial merge