Merge branch 'wip-mdl-46514' of https://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 23 Aug 2016 07:59:24 +0000 (08:59 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 23 Aug 2016 07:59:24 +0000 (08:59 +0100)

Trivial merge