Merge branch 'MDL-54606' of https://github.com/mr-russ/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 9 Aug 2016 08:32:46 +0000 (09:32 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 9 Aug 2016 08:32:46 +0000 (09:32 +0100)

Trivial merge