Merge branch 'wip-mdl-57325' of https://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 12 Dec 2016 12:23:22 +0000 (12:23 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 12 Dec 2016 12:23:22 +0000 (12:23 +0000)

Trivial merge