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