Merge branch 'MDL-55741' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 29 Aug 2016 12:08:37 +0000 (14:08 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 29 Aug 2016 12:08:37 +0000 (14:08 +0200)

Trivial merge