Merge branch 'MDL-50217' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 20 Oct 2015 13:56:33 +0000 (14:56 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 20 Oct 2015 13:56:33 +0000 (14:56 +0100)

Trivial merge