Merge branch 'wip-mdl-53956' of https://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 18 May 2016 09:45:22 +0000 (10:45 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 18 May 2016 09:45:22 +0000 (10:45 +0100)

Trivial merge