Merge branch 'wip-MDL-53638-fix' of https://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 28 Apr 2016 11:08:42 +0000 (13:08 +0200)
committerDan Poltawski <dan@moodle.com>
Fri, 29 Apr 2016 11:18:03 +0000 (12:18 +0100)

Trivial merge