Merge branch 'MDL-52226_master-fix' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 21 Dec 2015 08:31:55 +0000 (08:31 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 21 Dec 2015 08:31:55 +0000 (08:31 +0000)

Trivial merge