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

Trivial merge