Merge branch 'MDL-51435' of https://github.com/NeillM/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 13 Oct 2015 10:39:52 +0000 (11:39 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 13 Oct 2015 10:39:52 +0000 (11:39 +0100)

Trivial merge