Merge branch 'MDL-55360-master-workshopgradepass' of git://github.com/mudrd8mz/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 1 Aug 2016 17:57:00 +0000 (18:57 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 1 Aug 2016 17:57:00 +0000 (18:57 +0100)

Trivial merge