Merge branch 'wip-MDL-55127_master' of https://github.com/dg711/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 23 Aug 2016 10:12:46 +0000 (11:12 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 23 Aug 2016 10:12:46 +0000 (11:12 +0100)

Trivial merge