Merge branch 'MDL-29115' of git://github.com/rwijaya/moodle