Merge branch 'wip-mdl-57669-m' of https://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 17 Jan 2017 10:28:31 +0000 (10:28 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 17 Jan 2017 10:28:31 +0000 (10:28 +0000)

Trivial merge