Merge branch 'wip-mdl-54100' of https://github.com/rajeshtaneja/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 9 May 2016 06:34:23 +0000 (14:34 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 9 May 2016 06:34:23 +0000 (14:34 +0800)

Trivial merge