Merge branch 'MDL-51576-master-2' of git://github.com/ryanwyllie/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 13 Oct 2015 08:23:31 +0000 (09:23 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 13 Oct 2015 08:23:31 +0000 (09:23 +0100)

Trivial merge