Merge branch 'MDL-54847-master-fix' of git://github.com/cameron1729/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 2 Aug 2016 19:09:45 +0000 (20:09 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 2 Aug 2016 19:09:45 +0000 (20:09 +0100)

Trivial merge