Merge branch 'wip-mdl-57700' of https://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 23 Jan 2017 11:59:11 +0000 (11:59 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 23 Jan 2017 11:59:11 +0000 (11:59 +0000)

Trivial merge