Merge branch 'wip-MDL-59412-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Jul 2017 07:34:19 +0000 (09:34 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Jul 2017 07:34:19 +0000 (09:34 +0200)

Trivial merge