Merge branch 'MDL-53256-m' of https://github.com/micaherne/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 4 Apr 2016 17:02:44 +0000 (19:02 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 4 Apr 2016 17:02:44 +0000 (19:02 +0200)

Trivial merge