Merge branch 'wip-MDL-57782-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 30 Jan 2017 10:08:26 +0000 (10:08 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 30 Jan 2017 10:08:26 +0000 (10:08 +0000)

Trivial merge