Merge branch 'MDL-42571_master-fix2' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 19 Nov 2015 07:06:16 +0000 (07:06 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 19 Nov 2015 07:06:16 +0000 (07:06 +0000)

Trivial merge