Merge branch 'MDL-57282-master' of https://github.com/xow/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Jan 2017 11:38:14 +0000 (12:38 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Jan 2017 11:38:14 +0000 (12:38 +0100)

Trivial merge