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

Trivial merge