Merge branch 'wip-mdl-57531' of https://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 5 Jan 2017 06:51:54 +0000 (06:51 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 5 Jan 2017 06:51:54 +0000 (06:51 +0000)

Trivial merge