Merge branch 'wip-mdl-57232' of https://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 2 Dec 2016 15:00:48 +0000 (15:00 +0000)
committerDan Poltawski <dan@moodle.com>
Fri, 2 Dec 2016 15:00:48 +0000 (15:00 +0000)

Trivial merge