Merge branch 'wip-MDL-53557-fix' of https://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 30 Mar 2016 01:33:46 +0000 (09:33 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 30 Mar 2016 01:33:46 +0000 (09:33 +0800)

Trivial merge