Merge branch 'wip-MDL-56855-master' of https://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 10 Nov 2016 08:14:42 +0000 (08:14 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 10 Nov 2016 08:14:42 +0000 (08:14 +0000)

Trivial merge