Merge branch 'MDL-53904-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 2 May 2016 09:16:27 +0000 (10:16 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 2 May 2016 09:16:27 +0000 (10:16 +0100)

Trivial merge