Merge branch 'MDL-51399' of https://github.com/andrewhancox/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 14 Oct 2015 14:02:50 +0000 (15:02 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 14 Oct 2015 14:02:50 +0000 (15:02 +0100)

Trivial merge