Merge branch 'MDL-55320-master-fix2' of https://github.com/lameze/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 25 Aug 2016 07:07:31 +0000 (08:07 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 25 Aug 2016 07:07:31 +0000 (08:07 +0100)

Trivial merge