Merge branch 'MDL-55374-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 1 Aug 2016 12:50:37 +0000 (13:50 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 1 Aug 2016 12:50:37 +0000 (13:50 +0100)

Trivial merge