Merge branch 'MDL-55032-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 4 Jul 2016 12:28:48 +0000 (13:28 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 4 Jul 2016 12:28:48 +0000 (13:28 +0100)

Trivial merge