Merge branch 'wip-MDL-61786-master' of git://github.com/abgreeve/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Jun 2018 17:14:43 +0000 (19:14 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Jun 2018 17:14:43 +0000 (19:14 +0200)

Trivial merge