Merge branch 'MDL-57244-master' of git://github.com/abgreeve/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 1 Aug 2018 22:24:14 +0000 (00:24 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 1 Aug 2018 22:24:14 +0000 (00:24 +0200)

Trivial merge