Merge branch 'MDL-57841-master' of git://github.com/damyon/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 6 Feb 2017 19:18:17 +0000 (20:18 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 6 Feb 2017 19:18:17 +0000 (20:18 +0100)

Trivial merge