Merge branch 'MDL-55390_master-fix' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 9 Aug 2016 08:29:49 +0000 (09:29 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 9 Aug 2016 08:29:49 +0000 (09:29 +0100)

Trivial merge