Merge branch 'MDL-53641' of git://github.com/stronk7/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 4 Apr 2016 15:59:46 +0000 (16:59 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 4 Apr 2016 15:59:46 +0000 (16:59 +0100)

Trivial merge