Merge branch 'wip-mdl-52168' of https://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 3 Jan 2017 08:16:22 +0000 (08:16 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 3 Jan 2017 08:16:22 +0000 (08:16 +0000)

Trivial merge