Merge branch 'MDL-54557-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 6 Jun 2016 12:17:13 +0000 (13:17 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 6 Jun 2016 12:17:13 +0000 (13:17 +0100)

Trivial merge