Merge branch 'wip-MDL-60167-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 25 Sep 2017 17:53:48 +0000 (19:53 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 25 Sep 2017 17:53:48 +0000 (19:53 +0200)

Trivial merge