Merge branch 'wip-MDL-62526-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 4 Jul 2018 02:19:12 +0000 (04:19 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 4 Jul 2018 02:19:12 +0000 (04:19 +0200)

Trivial merge