Merge branch 'wip-MDL-58837-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 11 May 2017 13:26:33 +0000 (14:26 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 11 May 2017 13:26:33 +0000 (14:26 +0100)

Trivial merge