Merge branch 'wip-MDL-58854-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 10 May 2017 00:09:02 +0000 (02:09 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 10 May 2017 00:09:02 +0000 (02:09 +0200)

Trivial merge