Merge branch 'wip-mdl-56860' of git://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 15 Nov 2016 16:29:59 +0000 (16:29 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 15 Nov 2016 16:29:59 +0000 (16:29 +0000)

Trivial merge