Merge branch 'wip-MDL-58867-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 10 May 2017 10:16:19 +0000 (11:16 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 10 May 2017 10:16:19 +0000 (11:16 +0100)

Trivial merge