Merge branch 'wip-MDL-50824-master' of https://github.com/cdsmith-umn/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 6 Jun 2016 14:07:01 +0000 (15:07 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 6 Jun 2016 14:07:01 +0000 (15:07 +0100)

Trivial merge