Merge branch 'wip-mdl-54543' of https://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 12 May 2016 12:33:18 +0000 (13:33 +0100)
committerDavid Monllao <davidm@moodle.com>
Fri, 13 May 2016 10:11:28 +0000 (18:11 +0800)

Trivial merge