Merge branch 'MDL-42460-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 23 Feb 2016 14:36:54 +0000 (14:36 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 23 Feb 2016 14:36:54 +0000 (14:36 +0000)

Trivial merge