Merge branch 'wip-MDL-53363-master' of https://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 11 Apr 2016 15:34:26 +0000 (16:34 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 11 Apr 2016 15:34:26 +0000 (16:34 +0100)

Trivial merge