Merge branch 'wip-MDL-59259-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Jul 2018 23:09:47 +0000 (01:09 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Jul 2018 23:09:47 +0000 (01:09 +0200)

Trivial merge