Merge branch 'wip-mdl-53564' of https://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 21 Mar 2016 05:37:00 +0000 (13:37 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 21 Mar 2016 05:37:00 +0000 (13:37 +0800)

Trivial merge