Merge branch 'wip-mdl-46891-fix' of https://github.com/rajeshtaneja/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 14 Mar 2016 06:35:00 +0000 (14:35 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 14 Mar 2016 06:35:00 +0000 (14:35 +0800)

Trivial merge