Merge branch 'wip-mdl-55072-fix' of git://github.com/rajeshtaneja/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 25 Aug 2016 02:58:01 +0000 (10:58 +0800)
committerDavid Monllao <davidm@moodle.com>
Thu, 25 Aug 2016 02:58:01 +0000 (10:58 +0800)

Trivial merge