Merge branch 'MDL-55835-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 10 Oct 2016 23:21:14 +0000 (01:21 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 10 Oct 2016 23:21:14 +0000 (01:21 +0200)

Trivial merge