Merge branch 'MDL-53039-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 15 Feb 2016 15:32:51 +0000 (15:32 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 15 Feb 2016 15:32:51 +0000 (15:32 +0000)

Trivial merge