Merge branch 'wip-mdl-50163' of https://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 23 Nov 2015 11:33:55 +0000 (11:33 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 23 Nov 2015 11:33:55 +0000 (11:33 +0000)

Trivial merge