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

Trivial merge