Merge branch 'wip-mdl-56659' of https://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 25 Nov 2016 11:17:36 +0000 (11:17 +0000)
committerDan Poltawski <dan@moodle.com>
Fri, 25 Nov 2016 11:17:36 +0000 (11:17 +0000)

Trivial merge