Merge branch 'MDL-52530' of git://github.com/eugeneventer/moodle-fixes
authorDavid Monllao <davidm@moodle.com>
Tue, 29 Dec 2015 06:05:42 +0000 (14:05 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 29 Dec 2015 06:05:42 +0000 (14:05 +0800)

Trivial merge