Merge branch 'wip-MDL-57608-master-3' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Jan 2017 19:40:48 +0000 (20:40 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Jan 2017 19:40:48 +0000 (20:40 +0100)

Trivial merge