Merge branch 'wip-MDL-46495-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 10 Jul 2017 12:15:21 +0000 (13:15 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 10 Jul 2017 12:15:21 +0000 (13:15 +0100)

Trivial merge