Merge branch 'wip-MDL-50633-master2' of https://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 2 Nov 2015 14:04:44 +0000 (14:04 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 2 Nov 2015 14:04:44 +0000 (14:04 +0000)

Trivial merge