Merge branch 'MDL-53728' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 11 Apr 2016 13:02:29 +0000 (14:02 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 11 Apr 2016 13:02:29 +0000 (14:02 +0100)

Trivial merge