Merge branch 'MDL-52347_master-fix' of git://github.com/dmonllao/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 31 Dec 2015 05:20:40 +0000 (13:20 +0800)
committerDavid Monllao <davidm@moodle.com>
Thu, 31 Dec 2015 05:20:40 +0000 (13:20 +0800)

Trivial merge