Merge branch 'wip-mdl-55074-fix' of https://github.com/rajeshtaneja/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 26 Oct 2016 02:31:09 +0000 (10:31 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 26 Oct 2016 02:31:09 +0000 (10:31 +0800)

Trivial merge