Merge branch 'MDL-55874-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 12 Sep 2016 16:29:42 +0000 (18:29 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 12 Sep 2016 16:29:42 +0000 (18:29 +0200)

Trivial merge