Merge branch 'wip-mdl-50524' of https://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 7 Oct 2015 06:59:31 +0000 (07:59 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 7 Oct 2015 06:59:31 +0000 (07:59 +0100)

Trivial merge