Merge branch 'wip-MDL-59336-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Jul 2017 17:58:51 +0000 (19:58 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Jul 2017 17:58:51 +0000 (19:58 +0200)

Trivial merge