Merge branch 'wip-MDL-56633-master' of https://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 31 Oct 2016 15:36:21 +0000 (15:36 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 31 Oct 2016 15:36:21 +0000 (15:36 +0000)

Trivial merge