Merge branch 'MDL-55809-master' of https://github.com/xow/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 13 Dec 2016 19:05:15 +0000 (20:05 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 13 Dec 2016 19:05:15 +0000 (20:05 +0100)

Trivial merge