Merge branch 'wip-MDL-59468-master' of https://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 10 Jul 2017 02:25:23 +0000 (04:25 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 10 Jul 2017 02:25:23 +0000 (04:25 +0200)

Trivial merge