Merge branch 'MDL-54944-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Jul 2016 14:50:51 +0000 (16:50 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Jul 2016 14:50:51 +0000 (16:50 +0200)

Trivial merge