Merge branch 'wip-MDL-55826-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 5 Sep 2016 07:18:32 +0000 (08:18 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 5 Sep 2016 07:18:32 +0000 (08:18 +0100)

Trivial merge